diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-20 19:16:15 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-21 16:17:42 -0500 |
| commit | c525ec9bc82f3ddd325d2fa2a8850a600ca3c70b (patch) | |
| tree | 648a69aaf908549a7839f438843a306d2c6255d2 /app | |
| parent | 01b896f37198a9109ffd76ddb3dc1b831ba7fba1 (diff) | |
| download | gitlab-ce-c525ec9bc82f3ddd325d2fa2a8850a600ca3c70b.tar.gz | |
Merge branch 'slash-commands-load-fix' into 'master'
Fixed slash commands not loading
## What does this MR do?
Fixes an issue with slash commands not working when the autocomplete source is loading & then the new issue button is clicked. This also fixes an issue where the autocomplete source is loaded on pages where it isn't actually needed.
## What are the relevant issue numbers?
Closes #21774, #21807
See merge request !6207
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/project.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/_zen.html.haml | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 9fe94291db7..277eb71ea73 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -14,9 +14,6 @@ window.project_uploads_path = "#{namespace_project_uploads_path project.namespace,project}"; window.preview_markdown_path = "#{preview_markdown_path}"; -- content_for :scripts_body do - = render "layouts/init_auto_complete" if current_user - - content_for :header_content do .js-dropdown-menu-projects .dropdown-menu.dropdown-select.dropdown-menu-projects diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml index 3978fa60d66..cb97181b9e1 100644 --- a/app/views/projects/_zen.html.haml +++ b/app/views/projects/_zen.html.haml @@ -7,3 +7,6 @@ = text_area_tag attr, nil, class: classes, placeholder: placeholder %a.zen-control.zen-control-leave.js-zen-leave{ href: "#" } = icon('compress') + +- content_for :scripts_body do + = render "layouts/init_auto_complete" if current_user && (@target_project || @project) |