diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 09:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 09:07:51 +0000 |
| commit | 914ea32e0efca21436220df2c10e1bfbe4ed3da9 (patch) | |
| tree | e8eb3b97aea2006bd863c586b7ec41d51f654b3b /app/assets/javascripts/pages/projects/merge_requests/show/index.js | |
| parent | 3546e1bb0971347e9e9984de0799e3fb53743b33 (diff) | |
| download | gitlab-ce-914ea32e0efca21436220df2c10e1bfbe4ed3da9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages/projects/merge_requests/show/index.js')
| -rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/show/index.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/projects/merge_requests/show/index.js b/app/assets/javascripts/pages/projects/merge_requests/show/index.js index f61f4db78d5..ddc648702f1 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/show/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/show/index.js @@ -4,6 +4,8 @@ import initShow from '../init_merge_request_show'; document.addEventListener('DOMContentLoaded', () => { initShow(); - initSidebarBundle(); + if (gon.features && !gon.features.vueIssuableSidebar) { + initSidebarBundle(); + } initMrNotes(); }); |