diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 09:08:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 09:08:10 +0300 |
commit | ae192a2f1410b5f71397a64df76238b9d3b0afbe (patch) | |
tree | 12e42b011fdb20dde6961609933c1004b45019c1 /app/assets/javascripts/merge_request_tabs.js | |
parent | 3ecc3508dce791466f96f450d9eae7e73424306a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index e02109d1fd1..94041d77bb0 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -177,6 +177,7 @@ export default class MergeRequestTabs { this.peek = document.getElementById('js-peek'); this.sidebar = document.querySelector('.js-right-sidebar'); this.pageLayout = document.querySelector('.layout-page'); + this.expandSidebar = document.querySelector('.js-expand-sidebar'); this.paddingTop = 16; this.scrollPositions = {}; @@ -281,6 +282,8 @@ export default class MergeRequestTabs { const tab = this.mergeRequestTabs.querySelector(`.${action}-tab`); if (tab) tab.classList.add('active'); + this.expandSidebar?.classList.toggle('gl-display-none!', action !== 'show'); + if (action === 'commits') { this.loadCommits(href); // this.hideSidebar(); |