diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-15 19:27:21 +0300 |
|---|---|---|
| committer | Steve Azzopardi <steveazz@outlook.com> | 2018-10-16 14:52:33 +0300 |
| commit | 4fa1f7b8398e89a1ae443282d1e6110741556b01 (patch) | |
| tree | b173107004866f8a3ec45c309613cf9a799ed27c /app | |
| parent | 576664461f5b8ca86c1d7eab5a4882376766dd97 (diff) | |
Merge branch '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state' into 'master'
Allow Issue and Merge Request sidebar to be toggled from collapsed state
Closes #52532
See merge request gitlab-org/gitlab-ce!22353
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/main.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/right_sidebar.js | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index e8aac51a299..a88b575ad99 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -202,7 +202,6 @@ document.addEventListener('DOMContentLoaded', () => { $('.navbar-toggler').on('click', () => { $('.header-content').toggleClass('menu-expanded'); - gl.lazyLoader.loadCheck(); }); // Show/hide comments on diff diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js index b27d635c6ac..e75dbaa3413 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -57,8 +57,6 @@ Sidebar.prototype.sidebarToggleClicked = function (e, triggered) { $allGutterToggleIcons.removeClass('fa-angle-double-left').addClass('fa-angle-double-right'); $('aside.right-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded'); $('.layout-page').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded'); - - if (gl.lazyLoader) gl.lazyLoader.loadCheck(); } $this.attr('data-original-title', tooltipLabel); |