Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 799
    • Issues 799
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 56
    • Merge Requests 56
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !411

Open
Opened 2 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe](feat): Added in a warning if the user tries entering an email #331

minds#331

Replacing !347 (closed)

image

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat/login-warn-on-email-331 origin/feat/login-warn-on-email-331

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 feat/login-warn-on-email-331

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 feat/login-warn-on-email-331 into master
The source branch is 20 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #69612900 passed for 0c9a0fd9 on feat/login-warn-on-email-331
          Requires approval from Deployers. Approved by
          Marcelo Rivera
          Marcelo Rivera
          Martin Santangelo
          Martin Santangelo
          Emiliano Balbuena
          Emiliano Balbuena
          Brian Hatchet
          Brian Hatchet
          Mark Harding
          Mark Harding
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Mentions #331 and minds#331

          Deletes source branch

          • Discussion 2
          • Commits 6
          • Pipelines 3
          • Changes 3
          1/1 thread resolved
          • Loading...
          • Mark Harding
            Mark Harding @markeharding · 2 days ago
            Owner

            Need master pipeline.

          • Ben Hayward @benhayward.ben added 89 commits 2 days ago

            added 89 commits

            • cd329428...82595d15 - 88 commits from branch master
            • a838b31d - Merge branch 'master' of gitlab.com:minds/front into feat/login-warn-on-email-331

            Compare with previous version

          • Mark Harding @markeharding approved this merge request 1 day ago

            approved this merge request

          • Mark Harding @markeharding assigned to @brianhatchet and @edgebal 1 day ago

            assigned to @brianhatchet and @edgebal

          • Mark Harding @markeharding assigned to @eiennohi 1 day ago

            assigned to @eiennohi

          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 hour ago
            Resolved by Ben Hayward 1 hour ago
          • Ben Hayward @benhayward.ben added 1 commit 1 hour ago

            added 1 commit

            • 0c9a0fd9 - Update login.spec.ts

            Compare with previous version

          • Ben Hayward @benhayward.ben resolved all threads 1 hour ago

            resolved all threads

          • Marcelo Rivera @eiennohi approved this merge request 1 hour ago

            approved this merge request

          • 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
          3 Assignees
          Marcelo Rivera's avatar
          Emiliano Balbuena's avatar
          Brian Hatchet's avatar
          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
          6
          6 participants
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          user avatar
          Brian Hatchet
          user avatar
          Mark Harding
          user avatar
          Marcelo Rivera
          user avatar
          Ben Hayward
          Reference: minds/front!411