diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-07 18:08:39 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-07 18:08:39 +0100 |
| commit | 932b94f911394543a0377d712b2b28da827e4aad (patch) | |
| tree | 96d4aa00b0300b605a512b7febc50010378cb2db | |
| parent | 1dab640357fa1ba8992757499e4167fcd4ce6276 (diff) | |
| download | gitlab-ce-issue-description-gfm.tar.gz | |
Fixed GFM references not being included when update issue inlineissue-description-gfm
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/2878
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/issue-description-gfm.yml | 4 | ||||
| -rw-r--r-- | spec/features/issues/gfm_autocomplete_spec.rb | 12 |
3 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js index 2c56b718212..6cb9cfe1382 100644 --- a/app/assets/javascripts/gfm_auto_complete.js +++ b/app/assets/javascripts/gfm_auto_complete.js @@ -30,6 +30,7 @@ class GfmAutoComplete { this.input.each((i, input) => { const $input = $(input); $input.off('focus.setupAtWho').on('focus.setupAtWho', this.setupAtWho.bind(this, $input)); + $input.on('change.atwho', () => input.dispatchEvent(new Event('input'))); // This triggers at.js again // Needed for quick actions with suffixes (ex: /label ~) $input.on('inserted-commands.atwho', $input.trigger.bind($input, 'keyup')); diff --git a/changelogs/unreleased/issue-description-gfm.yml b/changelogs/unreleased/issue-description-gfm.yml new file mode 100644 index 00000000000..4d421bff677 --- /dev/null +++ b/changelogs/unreleased/issue-description-gfm.yml @@ -0,0 +1,4 @@ +--- +title: Fixed GFM references not being included when updating issues inline +merge_request: +author: diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb index a0f26bf9a92..fbfae02ff4a 100644 --- a/spec/features/issues/gfm_autocomplete_spec.rb +++ b/spec/features/issues/gfm_autocomplete_spec.rb @@ -14,6 +14,18 @@ feature 'GFM autocomplete', feature: true, js: true do wait_for_requests end + it 'updates issue descripton with GFM reference' do + find('.issuable-edit').click + + find('#issue-description').native.send_keys("@#{user.name[0...3]}") + + find('.atwho-view .cur').trigger('click') + + click_button 'Save changes' + + expect(find('.description')).to have_content(user.to_reference) + end + it 'opens autocomplete menu when field starts with text' do page.within '.timeline-content-form' do find('#note_note').native.send_keys('') |