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 142
    • Issues 142
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 11
    • Merge Requests 11
  • 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
  • !235

Merged
Opened 3 days ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

[Sprint/HipsterHedgehog] (fix) error message should appear for banned users

closes #996 (closed) Added await to method call

Edited 3 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/HipsterHedgehog.fix.login.keeps.spinning.and.not.showing.error.for.banned.users
git checkout -b juanmsolaro/mobile-native-sprint/HipsterHedgehog.fix.login.keeps.spinning.and.not.showing.error.for.banned.users 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/HipsterHedgehog.fix.login.keeps.spinning.and.not.showing.error.for.banned.users

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/HipsterHedgehog.fix.login.keeps.spinning.and.not.showing.error.for.banned.users into master
  • Email patches
  • Plain diff
Pipeline #67391839 passed for 00277b11 on juanmsolaro:sprint/HipsterHedgehog.fix.login.keeps.spinning.and.not.showing.error.for.banned.users
    Merge request approved. Approved by
    Ben Hayward
    Ben Hayward

    Merged by Martin Santangelo 3 minutes ago

    The changes were merged into master with 3092071b

    Closed #996 (closed)

    Pipeline #67722705 running for 3092071b on master
          • Discussion 0
          • Commits 1
          • Pipelines 1
          • Changes 1
          • Loading...
          • Juan Manuel Solaro @juanmsolaro changed the description 3 days ago

            changed the description

          • Ben Hayward @benhayward.ben approved this merge request 2 days ago

            approved this merge request

          • Martin Santangelo @msantang78 mentioned in commit 3092071b 3 minutes ago

            mentioned in commit 3092071b

          • Martin Santangelo @msantang78 merged 3 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
          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
          Ben Hayward
          user avatar
          Juan Manuel Solaro
          Reference: minds/mobile-native!235

          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.