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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 189
    • Issues 189
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 2
    • Merge Requests 2
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Minds
  • Minds MobileMinds Mobile
  • Merge Requests
  • !219

Merged
Opened 1 hour ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/GriddyGiraffe] (fix) boosted service init race condition

closes #981 (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/GiddyGiraffe.fix.boosted.service.race
git checkout -b msantang78/mobile-native-sprint/GiddyGiraffe.fix.boosted.service.race 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/GiddyGiraffe.fix.boosted.service.race

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/GiddyGiraffe.fix.boosted.service.race into master
  • Email patches
  • Plain diff
Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.
No approval required

Merged by Martin Santangelo 44 minutes ago

The changes were merged into master with ad3a5286

Closed #981 (closed)

Pipeline #66078024 (#267) running for ad3a5286 on master
        • Discussion 0
        • Commits 1
        • Pipelines 1
        • Changes 1
        • Loading...
        • Martin Santangelo @msantang78 changed milestone to %sprint: Giddy Giraffe 1 hour ago

          changed milestone to %sprint: Giddy Giraffe

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

          mentioned in commit ad3a5286

        • 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
        Assignee
        None
        Assign to
        sprint: Giddy Giraffe
        Milestone
        sprint: Giddy Giraffe
        Assign milestone
        None
        Time tracking
        No estimate or time spent
        0
        Labels
        None
        Assign labels
        • View project labels
        Lock merge request
        Unlocked
        1
        1 participant
        user avatar
        Martin Santangelo
        Reference: minds/mobile-native!219

        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.