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 107
    • Issues 107
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 8
    • Merge Requests 8
  • 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
  • !270

Merged
Opened 41 minutes ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/JollyJellyfish] (fix) translation reference in channel screen

closes #1114 (closed)

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.fix.translation.reference.channel.screen
git checkout -b msantang78/mobile-native-sprint/JollyJellyfish.fix.translation.reference.channel.screen 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 msantang78/mobile-native-sprint/JollyJellyfish.fix.translation.reference.channel.screen

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 msantang78:sprint/JollyJellyfish.fix.translation.reference.channel.screen into master
  • Email patches
  • Plain diff
Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.
Merge request approved. Approved by
Brian Hatchet
Brian Hatchet
Emiliano Balbuena
Emiliano Balbuena

Merged by Martin Santangelo 2 minutes ago

The changes were merged into master with bfdac0c2

Closed #1114 (closed)

Pipeline #72533484 running for bfdac0c2 on master
        • Discussion 0
        • Commits 1
        • Pipelines 1
        • Changes 1
        • Loading...
        • Martin Santangelo @msantang78 changed milestone to %sprint: Jolly Jellyfish 41 minutes ago

          changed milestone to %sprint: Jolly Jellyfish

        • Martin Santangelo @msantang78 added Squad::Green scoped label 41 minutes ago

          added Squad::Green scoped label

        • Emiliano Balbuena @edgebal approved this merge request 12 minutes ago

          approved this merge request

        • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 11 minutes ago

          approved this merge request

        • Martin Santangelo @msantang78 merged 2 minutes ago

          merged

        • Martin Santangelo @msantang78 mentioned in commit bfdac0c2 2 minutes ago

          mentioned in commit bfdac0c2

        • 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
        1
        Labels
        Squad::Green
        Assign labels
        • View project labels
        Lock merge request
        Unlocked
        3
        3 participants
        user avatar
        Martin Santangelo
        user avatar
        Brian Hatchet
        user avatar
        Emiliano Balbuena
        Reference: minds/mobile-native!270

        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.