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 113
    • Issues 113
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 14
    • Merge Requests 14
  • 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 1 week ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

[Sprint/InterestingIguana] (feat) enabling disabling comments in posts

Closes #1043 #1044 #1045 #1046 #1064

Edited 2 days ago by Juan Manuel Solaro

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/master
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 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 juanmsolaro:sprint/InterestingIguana.feat.enable.disable.comments into master
The source branch is 69 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #71264481 passed for bd1236c8 on juanmsolaro:sprint/InterestingIguana.feat.enable.disable.comments
    No approval required
    There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

    Closes #1043, #1044, #1045, #1046, and #1064

    You can merge this merge request manually using the
    • Discussion 1
    • Commits 7
    • Pipelines 6
    • Changes 16
    • Loading...
    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 1 week ago

      approved this merge request

    • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

      added 1 commit

      • eb0d1883 - (feat) disable comments on blogs

      Compare with previous version

    • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week 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 1 week ago

      unmarked as a Work In Progress

    • Juan Manuel Solaro @juanmsolaro changed the description 1 week ago

      changed the description

    • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week 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 3 days ago

      marked as a Work In Progress

    • Juan Manuel Solaro @juanmsolaro added 2 commits 2 days 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 days 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 days ago

      unmarked as a Work In Progress

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

      changed the description

    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet · 6 minutes ago
      Maintainer

      Got some merge conflicts that need cleaned up @juanmsolaro

    • 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
    0
    Labels
    None
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    2
    2 participants
    user avatar
    Brian Hatchet
    user avatar
    Juan Manuel Solaro
    Reference: minds/mobile-native!247