diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-24 20:28:34 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-30 16:50:02 -0500 |
| commit | 01824a0fac17331c7eacf40feb6882c508fe4880 (patch) | |
| tree | a2b36743d21a00975df505cb33fba6949bb45655 | |
| parent | 8d8f52ac17c7a8f9ec82b818b6097366e9aff329 (diff) | |
| download | gitlab-ce-01824a0fac17331c7eacf40feb6882c508fe4880.tar.gz | |
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-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/profiles/keys/new.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8cd9f342bf3..6f5c5d79724 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.3.3 (unreleased) - Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu) + - Enable "Add key" button when user fills in a proper key v 8.3.2 - Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll (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(); } }); |