Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Mobile
Minds Mobile
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 120
    • Issues 120
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 17
    • Merge Requests 17
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Minds
  • Minds MobileMinds Mobile
  • Merge Requests
  • !247

Open
Opened 2 weeks ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

[Sprint/InterestingIguana] (feat) enabling disabling comments and conversations

Closes #1043 #1044 #1045 #1046 #1064 #1123 (closed)

Edited just now by Martin Santangelo

Check out, review, and merge locally

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

git fetch https://gitlab.com/juanmsolaro/mobile-native.git sprint/InterestingIguana.feat.enable.disable.comments
git checkout -b juanmsolaro/mobile-native-sprint/InterestingIguana.feat.enable.disable.comments 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/release/3.8.0
git merge --no-ff juanmsolaro/mobile-native-sprint/InterestingIguana.feat.enable.disable.comments

Step 4. Push the result of the merge to GitLab

git push origin release/3.8.0

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 juanmsolaro:sprint/InterestingIguana.feat.enable.disable.comments into release/3.8.0
The source branch is 39 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #73162515 passed for 3a0981e8 on juanmsolaro:sprint/InterestingIguana.feat.enable.disable.comments
    Requires approval. Approved by
    Martin Santangelo
    Martin Santangelo
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request
    • Discussion 6
    • Commits 13
    • Pipelines 10
    • Changes 16
    2/2 threads resolved
    • Loading...
    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 2 weeks ago

      approved this merge request

    • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

      added 1 commit

      • eb0d1883 - (feat) disable comments on blogs

      Compare with previous version

    • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

      added 1 commit

      • 9e90af8f - (feat) add endpoint request for disabling comments

      Compare with previous version

    • Juan Manuel Solaro @juanmsolaro unmarked as a Work In Progress 2 weeks ago

      unmarked as a Work In Progress

    • Juan Manuel Solaro @juanmsolaro changed the description 2 weeks ago

      changed the description

    • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

      added 1 commit

      • 4a4cafd4 - (fix) add showerror method to blogs view

      Compare with previous version

    • Juan Manuel Solaro @juanmsolaro marked as a Work In Progress 2 weeks ago

      marked as a Work In Progress

    • Juan Manuel Solaro @juanmsolaro added 2 commits 2 weeks ago

      added 2 commits

      • 429ab71d - (fix) update test snapshots
      • d3e37b67 - (feat) ability to disable group conversations

      Compare with previous version

    • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

      added 1 commit

      • bd1236c8 - (fix) vertical align 'more' button

      Compare with previous version

    • Juan Manuel Solaro @juanmsolaro unmarked as a Work In Progress 2 weeks ago

      unmarked as a Work In Progress

    • Juan Manuel Solaro @juanmsolaro changed the description 2 weeks ago

      changed the description

      • Brian Hatchet
        Brian Hatchet :speech_balloon: @brianhatchet · 1 week ago
        Maintainer
        Resolved by Juan Manuel Solaro 1 week ago

        Got some merge conflicts that need cleaned up @juanmsolaro

      • Juan Manuel Solaro
        Juan Manuel Solaro
        Last reply by Juan Manuel Solaro 1 week ago
    • Juan Manuel Solaro @juanmsolaro added 70 commits 1 week ago

      added 70 commits

      • bd1236c8...dd7922c1 - 69 commits from branch minds:master
      • 9c52372f - Merge branch 'master' into 'sprint/InterestingIguana.feat.enable.disable.comments'

      Compare with previous version

    • Juan Manuel Solaro @juanmsolaro resolved all threads 1 week ago

      resolved all threads

    • Juan Manuel Solaro @juanmsolaro marked as a Work In Progress 5 days ago

      marked as a Work In Progress

    • Juan Manuel Solaro @juanmsolaro added 2 commits 5 days ago

      added 2 commits

      • f5fe7c80 - (feat) add feature flag to enable disable comments functionality
      • 0dc4185f - Merge branch 'sprint/InterestingIguana.feat.enable.disable.comments' of...

      Compare with previous version

    • Juan Manuel Solaro @juanmsolaro changed the description 5 days ago

      changed the description

    • Juan Manuel Solaro @juanmsolaro added 1 commit 5 days ago

      added 1 commit

      • ef113722 - (fix) add spacing to be on a par with standard

      Compare with previous version

    • Juan Manuel Solaro @juanmsolaro unmarked as a Work In Progress 5 days ago

      unmarked as a Work In Progress

    • Juan Manuel Solaro @juanmsolaro changed target branch from master to v3.8.0-rc2 5 days ago

      changed target branch from master to v3.8.0-rc2

    • Martin Santangelo
      Martin Santangelo @msantang78 started a thread on the diff 4 days ago
      Resolved by Martin Santangelo 22 hours ago
    • Juan Manuel Solaro @juanmsolaro added 2 commits 4 days ago

      added 2 commits

      • 0e36dd35 - (feat) put group conversation disabling behind a feature flag
      • 3a0981e8 - Merge branch 'sprint/JollyJellyfish.feat.group-conv.feature-flag' into...

      Compare with previous version

    • Martin Santangelo @msantang78 resolved all threads 22 hours ago

      resolved all threads

    • Martin Santangelo @msantang78 approved this merge request 22 hours ago

      approved this merge request

    • Martin Santangelo @msantang78 added MR::Awaiting Review scoped label 22 hours ago

      added MR::Awaiting Review scoped label

    • Martin Santangelo @msantang78 changed target branch from v3.8.0-rc2 to release/3.8.0 3 hours ago

      changed target branch from v3.8.0-rc2 to release/3.8.0

    • Martin Santangelo @msantang78 approved this merge request 27 minutes ago

      approved this merge request

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

      This also looks to include groups disabling conversations?

    • Martin Santangelo
      Martin Santangelo @msantang78 · 1 minute ago
      Maintainer

      Yes, because both use the CommentList component.

    • Martin Santangelo @msantang78 changed title from [Sprint/InterestingIguana] (feat) enabling disabling comments in posts to [Sprint/InterestingIguana] (feat) enabling disabling comments and conversations just now

      changed title from [Sprint/InterestingIguana] (feat) enabling disabling comments in posts to [Sprint/InterestingIguana] (feat) enabling disabling comments and conversations

    • Martin Santangelo
      Martin Santangelo @msantang78 · just now
      Maintainer

      I just updated the title of the MR

    • 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
    1
    Labels
    MR::Awaiting Review
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    4
    4 participants
    user avatar
    Martin Santangelo
    user avatar
    Mark Harding
    user avatar
    Juan Manuel Solaro
    user avatar
    Brian Hatchet
    Reference: minds/mobile-native!247