diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-30 07:07:18 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-30 07:07:18 +0000 |
| commit | 8900bd9d267f1524c3e5281dfedf644ec57fc62f (patch) | |
| tree | 96aefd0653e7bd5768fdc898e2bb1d696fed0331 /app/assets/javascripts/merge_request_tabs.js | |
| parent | 6bbbc0ba80d98a5479cf1c962835487f73e00ef7 (diff) | |
| parent | a7335c1188d32edd58aebdb818dbf4c49899149b (diff) | |
| download | gitlab-ce-8900bd9d267f1524c3e5281dfedf644ec57fc62f.tar.gz | |
Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'
Fixed sidebar not collapsing on merge request in mobile screens
Closes #32759
See merge request !12489
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 3cf3233cc65..7840f05a8ae 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -144,7 +144,9 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion'; this.resetViewContainer(); this.mountPipelinesView(); } else { - this.expandView(); + if (Breakpoints.get().getBreakpointSize() !== 'xs') { + this.expandView(); + } this.resetViewContainer(); this.destroyPipelinesView(); } |