diff options
author | Rémy Coutable <remy@rymai.me> | 2016-10-28 12:38:00 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-28 12:38:00 +0000 |
commit | 04c7c8d8bbc99eaee728c1ca3572b7ae2dc8d2fb (patch) | |
tree | 1b979be28d6d5c4accbc2c888d2638458d860c82 /CHANGELOG.md | |
parent | 8487af81db7a2d490cbdd3ae16e87c44df883396 (diff) | |
parent | af1936def9f03200be3b84748e67d7935c30d7fd (diff) | |
download | gitlab-ce-04c7c8d8bbc99eaee728c1ca3572b7ae2dc8d2fb.tar.gz |
Merge branch '5905-duplicate-email-errors' into 'master'
Only show one error message for an invalid email
Changes it to only validate the notification_email format if it's different from email.
Closes #5905
See merge request !7158
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a9e24717e81..8bfe62ec230 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix HipChat notifications rendering (airatshigapov, eisnerd) - Refactor Jira service to use jira-ruby gem - Add hover to trash icon in notes !7008 (blackst0ne) + - Only show one error message for an invalid email !5905 (lycoperdon) - Fix sidekiq stats in admin area (blackst0ne) - API: Fix booleans not recognized as such when using the `to_boolean` helper - Removed delete branch tooltip !6954 |