summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-22 18:13:59 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-22 18:13:59 +0000
commitb8980e89aa87901ef17f4fed58802d07ddbb1b6a (patch)
treea0baf5e37e23265cd2d4642f00cbca5d3754e4d3 /app/assets
parentd5732094e5203932a8386a044cf7727ab4b215e5 (diff)
parent08d2e03058ffd9696ff76780e5aa10a23b07a09e (diff)
downloadgitlab-ce-b8980e89aa87901ef17f4fed58802d07ddbb1b6a.tar.gz
Merge branch '24413-show-unconfirmed-email-status' into 'master'
shows unconfirmed email status in profile ## What does this MR do? This MR closes #24413 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? When modifying an account email address in profile settings a new confirmation email is sent, and shows the information that s/he got an email to confirm. ## Screenshots (if relevant) **Before** ![2016-11-22_19.54.51](/uploads/361fd605a3c1e997a58defe45a63081a/2016-11-22_19.54.51.gif) **After** ![2016-11-22_20.01.21](/uploads/6b07663f71d6684d2138798920cf07af/2016-11-22_20.01.21.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24413 See merge request !7611
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/profile/profile.js.es61
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/profile/profile.js.es6 b/app/assets/javascripts/profile/profile.js.es6
index 73858388261..3eb81808bd6 100644
--- a/app/assets/javascripts/profile/profile.js.es6
+++ b/app/assets/javascripts/profile/profile.js.es6
@@ -35,7 +35,6 @@
}
onSubmitForm(e) {
- e.preventDefault();
return this.saveForm();
}