diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-27 16:45:46 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-27 16:45:46 +0000 |
| commit | 883342ce36b5f38156a3376af7d8a2e274163917 (patch) | |
| tree | 707df8270e00c78004775f84422a88ccf6f43d61 | |
| parent | 23659c52daf42a343a005924615cf428b8a2d7a2 (diff) | |
| parent | e42169c28e14f4dbc6e4d35ae189b73d90278c42 (diff) | |
| download | gitlab-ce-883342ce36b5f38156a3376af7d8a2e274163917.tar.gz | |
Merge branch 'ssh-key-paste' into 'master'
Updates SSH key title after pasting key
Closes #28436
See merge request !9481
| -rw-r--r-- | app/assets/javascripts/profile/profile.js.es6 | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/ssh-key-paste.yml | 4 | ||||
| -rw-r--r-- | spec/features/profiles/keys_spec.rb | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/profile/profile.js.es6 b/app/assets/javascripts/profile/profile.js.es6 index 81374296522..4ccea0624ee 100644 --- a/app/assets/javascripts/profile/profile.js.es6 +++ b/app/assets/javascripts/profile/profile.js.es6 @@ -84,13 +84,14 @@ } $(function() { - $(document).on('focusout.ssh_key', '#key_key', function() { + $(document).on('input.ssh_key', '#key_key', function() { const $title = $('#key_title'); const comment = $(this).val().match(/^\S+ \S+ (.+)\n?$/); - if (comment && comment.length > 1 && $title.val() === '') { + + // Extract the SSH Key title from its comment + if (comment && comment.length > 1) { return $title.val(comment[1]).change(); } - // Extract the SSH Key title from its comment }); if (global.utils.getPagePath() === 'profiles') { return new Profile(); diff --git a/changelogs/unreleased/ssh-key-paste.yml b/changelogs/unreleased/ssh-key-paste.yml new file mode 100644 index 00000000000..1e34ef60f6e --- /dev/null +++ b/changelogs/unreleased/ssh-key-paste.yml @@ -0,0 +1,4 @@ +--- +title: SSH key field updates title after pasting key +merge_request: +author: diff --git a/spec/features/profiles/keys_spec.rb b/spec/features/profiles/keys_spec.rb index eb1050d21c6..2f436f153aa 100644 --- a/spec/features/profiles/keys_spec.rb +++ b/spec/features/profiles/keys_spec.rb @@ -15,7 +15,7 @@ feature 'Profile > SSH Keys', feature: true do scenario 'auto-populates the title', js: true do fill_in('Key', with: attributes_for(:key).fetch(:key)) - expect(find_field('Title').value).to eq 'dummy@gitlab.com' + expect(page).to have_field("Title", with: "dummy@gitlab.com") end scenario 'saves the new key' do |