diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-05 00:36:07 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-10-05 00:36:07 +0300 |
| commit | 8e3490698c0f9c0737f40297d35b62d67688cc50 (patch) | |
| tree | f09a4a6a34689f38f761423b748f6b0c090049c7 | |
| parent | d031e0e88f4c26fc7c77e246ab28c8490ca00183 (diff) | |
| parent | f8d11e8216c67b71f1cb82c85adf8f82412909be (diff) | |
Merge branch '52194-trim-extra-whitespace-invite-member' into 'master'
Trim whitespace when inviting a new user by email
Closes #52194
See merge request gitlab-org/gitlab-ce!22119
| -rw-r--r-- | app/assets/javascripts/users_select.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/52194-trim-extra-whitespace-invite-member.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index e19bbbacf4d..b9dfa22dd49 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -592,7 +592,7 @@ function UsersSelect(currentUser, els, options = {}) { if (showEmailUser && data.results.length === 0 && query.term.match(/^[^@]+@[^@]+$/)) { var trimmed = query.term.trim(); emailUser = { - name: "Invite \"" + query.term + "\" by email", + name: "Invite \"" + trimmed + "\" by email", username: trimmed, id: trimmed, invite: true diff --git a/changelogs/unreleased/52194-trim-extra-whitespace-invite-member.yml b/changelogs/unreleased/52194-trim-extra-whitespace-invite-member.yml new file mode 100644 index 00000000000..d96c2bc7acd --- /dev/null +++ b/changelogs/unreleased/52194-trim-extra-whitespace-invite-member.yml @@ -0,0 +1,5 @@ +--- +title: Trim whitespace when inviting a new user by email +merge_request: 22119 +author: Jacopo Beschi @jacopo-beschi +type: fixed |