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 136
    • Issues 136
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 44
    • Merge Requests 44
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • 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
  • !152

Open
Opened 2 months ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

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

closes front#418

depends on front!276

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/CleverChipmunk.feat.ability-to-disable-group-conversations
git checkout -b eiennohi/engine-sprint/CleverChipmunk.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/CleverChipmunk.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/CleverChipmunk.feat.ability-to-disable-group-conversations into master
The source branch is 304 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #58414014 passed for aa2992ee on eiennohi:sprint/CleverChipmunk.feat.ability-to-disable-group-conversations
      Requires approval.
      Ready to be merged automatically. Ask someone with write access to this repository to merge this request

      Allows commits from members who can merge to the target branch

      Closes front#418

      Deletes source branch

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

        mentioned in merge request front!276

      • Mark Harding
        Mark Harding @markeharding started a thread on the diff 2 months ago
        Controllers/api/v1/comments.php
        194 194 }
        195 195
        196 196 if ($entity->type == 'group') {
        197 if ($entity->conversationDisabled == 1) {
        • Mark Harding
          Mark Harding @markeharding · 2 months ago
          Owner

          can we use the isConversionDisabled() function instead?

        • Please register or sign in to reply
      • Mark Harding @markeharding added MR::Awaiting Review label 4 days ago

        added MR::Awaiting Review label

      • Marcelo Rivera
        Marcelo Rivera @eiennohi started a thread on the diff 2 hours ago
        Controllers/api/v1/comments.php
        137 137 break;
        138 138 case is_numeric($pages[0]):
        139 139 default:
        140 140 $entity = new \Minds\Entities\Entity($pages[0]);
        • Marcelo Rivera
          Marcelo Rivera @eiennohi · 2 hours ago
          Developer

          use EntitiesBuilder::single

        • Please register or sign in to reply
      • 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
      Assignee
      None
      Assign to
      None
      Milestone
      None
      Assign milestone
      None
      Time tracking
      No estimate or time spent
      1
      Labels
      MR::Awaiting Review
      Assign labels
      • View project labels
      Lock merge request
      Unlocked
      2
      2 participants
      user avatar
      Marcelo Rivera
      user avatar
      Mark Harding
      Reference: minds/engine!152