Merge branch 'issue_14353' into 'master'

Ignore toggling the sidebar for resolutions over 1200px width Closes #14353 ![sidebar1](/uploads/4b8d0eaa1b320c319239cb572932f740/sidebar1.gif) See merge request !3547

Merge branch 'issue_14353' into 'master'
6e47f309 · Jacob Schatz · d2c9137f · 83630167 · 6e47f309
Commit 6e47f309 authored Apr 11, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

merge_request_tabs.js.coffee app/assets/javascripts/merge_request_tabs.js.coffee +2 -1

No files found.
--- 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()