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 10
    • Merge Requests 10
  • 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
  • !280

Merged
Opened 17 hours ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/JollyJellyfish] (fix) channel feed prepend

closes #1134

Check out, review, and merge locally

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

git fetch https://gitlab.com/msantang78/mobile-native.git sprint/JollyJellyfish.bug.should.prepend.post.mychannel
git checkout -b msantang78/mobile-native-sprint/JollyJellyfish.bug.should.prepend.post.mychannel 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 msantang78/mobile-native-sprint/JollyJellyfish.bug.should.prepend.post.mychannel

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 msantang78:sprint/JollyJellyfish.bug.should.prepend.post.mychannel into release/3.8.0
  • Email patches
  • Plain diff
Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.
Merge request approved. Approved by
Mark Harding
Mark Harding
Brian Hatchet
Brian Hatchet

Merged by Martin Santangelo 24 minutes ago

The changes were merged into release/3.8.0 with a8c34bec

Pipeline #73803753 running for a8c34bec on release/3.8.0
          • Discussion 0
          • Commits 1
          • Pipelines 1
          • Changes 1
          • Loading...
          • Martin Santangelo @msantang78 changed milestone to %sprint: Jolly Jellyfish 17 hours ago

            changed milestone to %sprint: Jolly Jellyfish

          • Martin Santangelo @msantang78 added Squad::Green scoped label 17 hours ago

            added Squad::Green scoped label

          • Martin Santangelo @msantang78 changed target branch from master to v3.8.0-rc2 8 hours ago

            changed target branch from master to v3.8.0-rc2

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

            added MR::Awaiting Review scoped label

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

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

          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 2 hours ago

            approved this merge request

          • Mark Harding @markeharding approved this merge request 2 hours ago

            approved this merge request

          • Martin Santangelo @msantang78 merged 24 minutes ago

            merged

          • Martin Santangelo @msantang78 mentioned in commit a8c34bec 24 minutes ago

            mentioned in commit a8c34bec

          • 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
          sprint: Jolly Jellyfish
          Milestone
          sprint: Jolly Jellyfish
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          2
          Labels
          MR::Awaiting Review Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          3
          3 participants
          user avatar
          Martin Santangelo
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          Reference: minds/mobile-native!280

          Revert this merge request

          This will create a new commit in order to revert the existing changes.

          Switch branch
          Cancel
          A new branch will be created in your fork and a new merge request will be started.

          Cherry-pick this merge request

          Switch branch
          Cancel
          A new branch will be created in your fork and a new merge request will be started.