Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-24 23:28:34 +0300
committerDouwe Maan <douwe@gitlab.com>2015-12-24 23:28:34 +0300
commit7b25da74ea017814c3f420bd57470af483617d4f (patch)
treeca95cf449b6fe9fc0f49d5559df7e9ffddc8848e
parente3befaed82f9aa52c79a1d4c437fe4fc63f8d07a (diff)
parent8309ef45a959715ed6d0727dabe6cc072cea8781 (diff)
Merge branch 'fix-add-key-submit' into 'master'
Enable "Add key" button when user fills in a proper key Closes #4295 See merge request !2208
-rw-r--r--CHANGELOG3
-rw-r--r--app/views/profiles/keys/new.html.haml2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index de8ac5161a0..2e12889cb70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,9 @@ v 8.4.0 (unreleased)
- Add CAS support (tduehr)
- Add link to merge request on build detail page.
+v 8.3.2 (unreleased)
+ - Enable "Add key" button when user fills in a proper key
+
v 8.3.1
- Fix Error 500 when global milestones have slashes (Stan Hu)
- Fix Error 500 when doing a search in dashboard before visiting any project (Stan Hu)
diff --git a/app/views/profiles/keys/new.html.haml b/app/views/profiles/keys/new.html.haml
index 11166dc6d99..13a18269d11 100644
--- a/app/views/profiles/keys/new.html.haml
+++ b/app/views/profiles/keys/new.html.haml
@@ -12,6 +12,6 @@
comment = val.match(/^\S+ \S+ (.+)\n?$/);
if( comment && comment.length > 1 && title.val() == '' ){
- $('#key_title').val( comment[1] );
+ $('#key_title').val( comment[1] ).change();
}
});