diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-06-19 23:29:49 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-06-19 23:29:49 +0000 |
| commit | f86ac8f568177aa4586963098a469f28189e2b04 (patch) | |
| tree | c66754e00d56417f898a60947b175cb5ad93ea1d /app | |
| parent | 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d (diff) | |
| parent | a7750f1b5e27aa72db6cc0ec79dfe3be3fb6513e (diff) | |
| download | gitlab-ce-f86ac8f568177aa4586963098a469f28189e2b04.tar.gz | |
Merge branch 'enable-autocomplete-on-project-snippets' into 'master'
Enable autocomplete on project snippets
Closes #33911
See merge request !12286
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 2 | ||||
| -rw-r--r-- | app/views/projects/snippets/show.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index f4a30f7d393..88b4b567fa9 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -226,6 +226,8 @@ import initSettingsPanels from './settings_panels'; case 'projects:snippets:edit': case 'projects:snippets:create': case 'projects:snippets:update': + new gl.GLForm($('.snippet-form'), true); + break; case 'snippets:new': case 'snippets:edit': case 'snippets:create': diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml index 37b114e7a3a..847f3c2f348 100644 --- a/app/views/projects/snippets/show.html.haml +++ b/app/views/projects/snippets/show.html.haml @@ -9,4 +9,4 @@ .row-content-block.top-block.content-component-block = render 'award_emoji/awards_block', awardable: @snippet, inline: true - #notes= render "shared/notes/notes_with_form", :autocomplete => false + #notes= render "shared/notes/notes_with_form", :autocomplete => true |