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 795
    • Issues 795
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 63
    • Merge Requests 63
  • 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
  • !347

Closed
Opened 3 weeks 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

image

Edited 3 weeks ago by Ben Hayward

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/front.git login-warn-on-email-entered
git checkout -b benhayward.ben/front-login-warn-on-email-entered 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 benhayward.ben/front-login-warn-on-email-entered

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 benhayward.ben:login-warn-on-email-entered into master
  • Email patches
  • Plain diff
Pipeline #66270688 passed for cd329428 on benhayward.ben:login-warn-on-email-entered
    Requires approval from Devs. Approved by
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet
    Mark Harding
    Mark Harding
    Marcelo Rivera
    Marcelo Rivera
    Martin Santangelo
    Martin Santangelo

    Closed by Ben Hayward 1 hour ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Mentions #331 and minds#331

    Deletes source branch

    • Discussion 4
    • Commits 4
    • Pipelines 4
    • Changes 3
    3/3 discussions resolved
    • Loading...
    • Ben Hayward @benhayward.ben changed the description 3 weeks ago

      changed the description

    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 3 weeks ago

      approved this merge request

    • Emiliano Balbuena @edgebal approved this merge request 3 weeks ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding started a discussion on an old version of the diff 3 weeks ago
      Resolved by Ben Hayward 2 weeks ago
    • Mark Harding
      Mark Harding @markeharding started a discussion on an old version of the diff 3 weeks ago
      Resolved by Ben Hayward 2 weeks ago
    • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

      added 1 commit

      • bce22dd4 - changes for feedback

      Compare with previous version

    • Ben Hayward @benhayward.ben resolved all discussions 2 weeks ago

      resolved all discussions

    • Mark Harding
      Mark Harding @markeharding started a discussion on an old version of the diff 2 weeks ago
      Resolved by Ben Hayward 2 weeks ago
    • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

      added 1 commit

      • 61e7f054 - Changed email check to a regex exp

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

      added 1 commit

      • cd329428 - Update test

      Compare with previous version

    • Ben Hayward @benhayward.ben resolved all discussions 2 weeks ago

      resolved all discussions

    • Emiliano Balbuena @edgebal approved this merge request 1 week ago

      approved this merge request

    • Mark Harding @markeharding added MR::Awaiting Review label 2 days ago

      added MR::Awaiting Review label

    • Ben Hayward @benhayward.ben mentioned in merge request !411 1 hour ago

      mentioned in merge request !411

    • Ben Hayward @benhayward.ben closed 1 hour ago

      closed

    • 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
    1
    Labels
    MR::Awaiting Review
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Brian Hatchet
    user avatar
    Mark Harding
    user avatar
    Marcelo Rivera
    user avatar
    Martin Santangelo
    user avatar
    Ben Hayward
    user avatar
    Emiliano Balbuena
    Reference: minds/front!347