diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-11 00:40:54 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-11 00:40:54 +0000 |
| commit | 6e47f30932efa2d3db1b62d82d9b3f081eac6d45 (patch) | |
| tree | 4b3a65914251de07b46f67aab8fc05846a2a9d38 /app | |
| parent | d2c9137fea1db2551ce6a5bf7e41c749ae572b66 (diff) | |
| parent | 836301676adba7a91e4539f3d0e554873f06fc99 (diff) | |
| download | gitlab-ce-6e47f30932efa2d3db1b62d82d9b3f081eac6d45.tar.gz | |
Merge branch 'issue_14353' into 'master'
Ignore toggling the sidebar for resolutions over 1200px width
Closes #14353
See merge request !3547
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 839e6ec2c08..9946249adbf 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -73,7 +73,8 @@ class @MergeRequestTabs @expandView() else if action == 'diffs' @loadDiff($target.attr('href')) - @shrinkView() + if bp? and bp.getBreakpointSize() isnt 'lg' + @shrinkView() else if action == 'builds' @loadBuilds($target.attr('href')) @expandView() |