diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-14 12:06:48 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-14 12:06:48 +0100 |
| commit | a499367d6d9de4b229d4469756a79d1e885712d6 (patch) | |
| tree | 82fcf87730e8f7f9c8e8c875cc6ee2e0388703d5 /app | |
| parent | 3d5856541b97bf5947437ce26b934522fe52489c (diff) | |
| parent | 7e4fcbf9bec34bb4c8e023f3726a99273850f800 (diff) | |
| download | gitlab-ce-a499367d6d9de4b229d4469756a79d1e885712d6.tar.gz | |
Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collections
* master:
Hide emoji popup after multiple spaces or blank lines
Remove enforcing uniqueness of build variables
Improve pipeline tests for variables to test ordering
Improve tests for predefined variables for a build
Conflicts:
spec/models/ci/build_spec.rb
spec/models/ci/pipeline_spec.rb
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js index 43a5325cf71..8259133c95b 100644 --- a/app/assets/javascripts/gfm_auto_complete.js +++ b/app/assets/javascripts/gfm_auto_complete.js @@ -132,9 +132,8 @@ class GfmAutoComplete { callbacks: { ...this.getDefaultCallbacks(), matcher(flag, subtext) { - const relevantText = subtext.trim().split(/\s/).pop(); const regexp = new RegExp(`(?:[^${glRegexp.unicodeLetters}0-9:]|\n|^):([^:]*)$`, 'gi'); - const match = regexp.exec(relevantText); + const match = regexp.exec(subtext); return match && match.length ? match[1] : null; }, |