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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 824
    • Issues 824
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 62
    • Merge Requests 62
  • 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

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

image

Edited 2 days 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
The source branch is 22 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #66147939 (#898) passed for bce22dd4 on benhayward.ben:login-warn-on-email-entered
    Requires 2 more approvals from Devs.
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet
    Marcelo Rivera
    Marcelo Rivera
    Mark Harding
    Mark Harding
    Martin Santangelo
    Martin Santangelo
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request

    Allows commits from members who can merge to the target branch

    Mentions #331 and minds#331

    Deletes source branch

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

      changed the description

    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 2 days ago

      approved this merge request

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

      approved this merge request

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

      added 1 commit

      • bce22dd4 - changes for feedback

      Compare with previous version

    • Ben Hayward @benhayward.ben resolved all discussions 12 hours ago

      resolved all discussions

    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 4 hours ago
      src/app/modules/forms/login/login.ts
      39 38 if (this.inProgress)
      40 39 return;
      41 40
      41 let username = this.form.value.username.trim();
      42 if (username.includes('@') && username.indexOf('@') != 0) {
      • Mark Harding
        Mark Harding @markeharding · 4 hours ago
        Owner

        This is still inaccurate. An @ symbol doesn't imply that its an email. We should be detecting a domain too.

      Please register or sign in to reply
    • 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
    6
    6 participants
    user avatar
    Emiliano Balbuena
    user avatar
    Brian Hatchet
    user avatar
    Marcelo Rivera
    user avatar
    Mark Harding
    user avatar
    Martin Santangelo
    user avatar
    Ben Hayward
    Reference: minds/front!347