summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-04-05 13:25:32 -0500
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-10 20:03:36 -0400
commita7c11fe47361527798b41d0ee9dc344b144a3b50 (patch)
tree0cf99a4becce9ee31f6b108be7e4fc9dbdd30459
parent0631a1e9e2ad281d460b9183609e9fcef0bf4c6b (diff)
downloadgitlab-ce-a7c11fe47361527798b41d0ee9dc344b144a3b50.tar.gz
Ignore toggling sidebar for above 1200px resolution
-rw-r--r--app/assets/javascripts/merge_request_tabs.js.coffee3
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..e45f91c2221 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.getBreakpointSize() isnt 'lg'
+ @shrinkView()
else if action == 'builds'
@loadBuilds($target.attr('href'))
@expandView()