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 108
    • Issues 108
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 9
    • Merge Requests 9
  • 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
  • !265

Merged
Opened 19 hours ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

[Sprint/JollyJellyfish] (fix) onboarding translations should appear correctly

closes #1108 (closed)

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/JollyJellyfish.fix.wallet.onboarding.missing.translation.file
git checkout -b juanmsolaro/mobile-native-sprint/JollyJellyfish.fix.wallet.onboarding.missing.translation.file 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/JollyJellyfish.fix.wallet.onboarding.missing.translation.file

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/JollyJellyfish.fix.wallet.onboarding.missing.translation.file into master
  • Email patches
  • Plain diff
Pipeline #72354768 passed for ad08a658 on juanmsolaro:sprint/JollyJellyfish.fix.wallet.onboarding.missing.translation.file
    Merge request approved. Approved by
    Brian Hatchet
    Brian Hatchet

    Merged by Martin Santangelo 44 minutes ago

    The changes were merged into master with a35342cc

    Closed #1108 (closed)

    Pipeline #72521803 running for a35342cc on master
          • Discussion 0
          • Commits 2
          • Pipelines 2
          • Changes 1
          • Loading...
          • Juan Manuel Solaro @juanmsolaro added 1 commit 17 hours ago

            added 1 commit

            • ad08a658 - (fix) password message in onboarding should appear

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 1 hour ago

            approved this merge request

          • Martin Santangelo @msantang78 mentioned in commit a35342cc 44 minutes ago

            mentioned in commit a35342cc

          • Martin Santangelo @msantang78 merged 44 minutes ago

            merged

          • 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
          3
          3 participants
          user avatar
          Martin Santangelo
          user avatar
          Brian Hatchet
          user avatar
          Juan Manuel Solaro
          Reference: minds/mobile-native!265

          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.