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 822
    • Issues 822
    • 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 1 day 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 1 day 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 14 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #65725961 (#892) passed for 798b7bee on benhayward.ben:login-warn-on-email-entered
    Merge request approved. Approved by
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet
    Mark Harding
    Mark Harding
    Marcelo Rivera
    Marcelo Rivera
    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 2
    • Commits 1
    • Pipelines 1
    • Changes 3
    0/2 discussions resolved
    • Loading...
    • Ben Hayward @benhayward.ben changed the description 1 day ago

      changed the description

    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 20 hours ago

      approved this merge request

    • Emiliano Balbuena @edgebal approved this merge request 2 hours ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 1 hour ago
      src/app/modules/forms/login/login.ts
      39 38 if (this.inProgress)
      40 39 return;
      41 40
      41 if (this.form.value.username.includes('@')) {
      • Mark Harding
        Mark Harding @markeharding · 1 hour ago
        Owner

        Condition here does not prove its an email. It could very well be their username with a @ at the start, so I think there should be an extra check here.

      Please register or sign in to reply
    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 1 hour ago
      src/app/modules/forms/login/login.html
      37 37 i18n="@@MINDS__LOGIN__EXCEPTION__INVALID_TOKEN">
      38 38 Invalid token
      39 39 </ng-container>
      40 <ng-container
      41 *ngIf="errorMessage == 'LoginException::EmailAddress'"
      42 i18n="@@MINDS__LOGIN__EXCEPTION__ENTERED_EMAIL_ADDRESS_NOT_USERNAME">
      43 You've entered a email address rather than a username.
      • Mark Harding
        Mark Harding @markeharding · 1 hour ago
        Owner

        Change to "Please enter a username instead of an email address".

      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
    Mark Harding
    user avatar
    Marcelo Rivera
    user avatar
    Martin Santangelo
    user avatar
    Emiliano Balbuena
    user avatar
    Brian Hatchet
    user avatar
    Ben Hayward
    Reference: minds/front!347