Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 174
    • Issues 174
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 42
    • Merge Requests 42
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !70

Closed
Opened 5 months ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/Platform] (feat): ability to disable group conversations

closes #174 (closed)

depends on front!117

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.com/eiennohi/engine.git sprint/Platform.feat.ability-to-disable-group-conversations
git checkout -b eiennohi/engine-sprint/Platform.feat.ability-to-disable-group-conversations FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff eiennohi/engine-sprint/Platform.feat.ability-to-disable-group-conversations

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge eiennohi:sprint/Platform.feat.ability-to-disable-group-conversations into master
  • Email patches
  • Plain diff
Pipeline #45608235 passed for cc51994e on eiennohi:sprint/Platform.feat.ability-to-disable-group-conversations
      Requires 2 more approvals from Devs and Deployers.
      Mark Harding
      Mark Harding
      Rami Albatal
      Rami Albatal
      Martin Santangelo
      Martin Santangelo
      Emiliano Balbuena
      Emiliano Balbuena
      Brian Hatchet
      Brian Hatchet

      Closed by Mark Harding 17 minutes ago

      The changes were not merged into master

      Allows commits from members who can merge to the target branch

      Did not close #174 (closed)

      Deletes source branch

      • Discussion 2
      • Commits 1
      • Pipelines 1
      • Changes 3
      0/1 thread resolved
      • Loading...
      • Marcelo Rivera @eiennohi mentioned in merge request front!117 5 months ago

        mentioned in merge request front!117

      • Mark Harding
        Mark Harding @markeharding started a thread on the diff 4 months ago
        Controllers/api/v1/comments.php
        141 141
        142 142 if ($entity instanceof Entities\Activity && $entity->remind_object) {
        143 143 $entity = (object) $entity->remind_object;
        144 } else if ($entity instanceof Entities\Group && $entity->getConversationDisabled()) {
        • Mark Harding
          Mark Harding @markeharding · 4 months ago
          Owner

          elseif all one word?

        • Please register or sign in to reply
      • Mark Harding @markeharding added MR::Awaiting Review scoped label 3 weeks ago

        added MR::Awaiting Review scoped label

      • Mark Harding @markeharding added Squad::Yellow scoped label 6 days ago

        added Squad::Yellow scoped label

      • Mark Harding
        Mark Harding @markeharding · 17 minutes ago
        Owner

        Replaced by !253

      • Mark Harding @markeharding closed 17 minutes ago

        closed

      • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
      Please register or sign in to reply
      0 Assignees
      None
      Assign to
      None
      Milestone
      None
      Assign milestone
      None
      Time tracking
      No estimate or time spent
      2
      Labels
      MR::Awaiting Review Squad::Yellow
      Assign labels
      • View project labels
      Lock merge request
      Unlocked
      7
      7 participants
      user avatar
      Mark Harding
      user avatar
      Rami Albatal
      user avatar
      Martin Santangelo
      user avatar
      Emiliano Balbuena
      user avatar
      Brian Hatchet
      user avatar
      Ben Hayward
      user avatar
      Marcelo Rivera
      Reference: minds/engine!70