diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-27 12:35:33 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-27 12:35:33 +0000 |
| commit | a15f21581aa3dfb40bbf61eb0e7e471f9b7d7250 (patch) | |
| tree | 7eba7c988bdef8f91a7b0555053a37985cff9afb | |
| parent | 9e72d3c3bd7dd14a7e6aeee420191030d1f300a3 (diff) | |
| parent | 9b28cebc59f4324028b223e678c16c75b49bf79f (diff) | |
| download | gitlab-ce-a15f21581aa3dfb40bbf61eb0e7e471f9b7d7250.tar.gz | |
Merge branch '48528-fix-mr-autocompletion' into 'master'
Resolve "`!` autocomplete does not work anymore"
Closes #48528
See merge request gitlab-org/gitlab-ce!20204
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/48528-fix-mr-autocompletion.yml | 5 | ||||
| -rw-r--r-- | spec/helpers/application_helper_spec.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f5d94ad96a1..0190aa90763 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -270,7 +270,7 @@ module ApplicationHelper { members: members_project_autocomplete_sources_path(object, type: noteable_type, type_id: params[:id]), issues: issues_project_autocomplete_sources_path(object), - merge_requests: merge_requests_project_autocomplete_sources_path(object), + mergeRequests: merge_requests_project_autocomplete_sources_path(object), labels: labels_project_autocomplete_sources_path(object, type: noteable_type, type_id: params[:id]), milestones: milestones_project_autocomplete_sources_path(object), commands: commands_project_autocomplete_sources_path(object, type: noteable_type, type_id: params[:id]) diff --git a/changelogs/unreleased/48528-fix-mr-autocompletion.yml b/changelogs/unreleased/48528-fix-mr-autocompletion.yml new file mode 100644 index 00000000000..ac44f878d1d --- /dev/null +++ b/changelogs/unreleased/48528-fix-mr-autocompletion.yml @@ -0,0 +1,5 @@ +--- +title: Fix broken '!' support to autocomplete MRs in GFM fields +merge_request: 20204 +author: +type: fixed diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 593b2ca1825..14297a1a544 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -157,7 +157,7 @@ describe ApplicationHelper do let(:noteable_type) { Issue } it 'returns paths for autocomplete_sources_controller' do sources = helper.autocomplete_data_sources(project, noteable_type) - expect(sources.keys).to match_array([:members, :issues, :merge_requests, :labels, :milestones, :commands]) + expect(sources.keys).to match_array([:members, :issues, :mergeRequests, :labels, :milestones, :commands]) sources.keys.each do |key| expect(sources[key]).not_to be_nil end |