diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-09-19 18:02:52 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-09-20 00:51:00 -0500 |
| commit | 76ae5af8ce9d88cb1da4f8b9836fe78b7c2ad30e (patch) | |
| tree | a2806e88efa0a00a1b912b1f8ba61581ee613449 /app/assets/javascripts/merge_request.js | |
| parent | 791079e2abeef1d3ebeecc8157bfb02cfdf9b36d (diff) | |
| download | gitlab-ce-76ae5af8ce9d88cb1da4f8b9836fe78b7c2ad30e.tar.gz | |
ensure the 'fixed layout' preference is honored whenever possible
see #22343 for issue description
Diffstat (limited to 'app/assets/javascripts/merge_request.js')
| -rw-r--r-- | app/assets/javascripts/merge_request.js | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index 05644b3d03c..02ff5a382e2 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -36,13 +36,10 @@ }; MergeRequest.prototype.initTabs = function() { - if (this.opts.action !== 'new') { - // `MergeRequests#new` has no tab-persisting or lazy-loading behavior - window.mrTabs = new MergeRequestTabs(this.opts); - } else { - // Show the first tab (Commits) - return $('.merge-request-tabs a[data-toggle="tab"]:first').tab('show'); + if (window.mrTabs) { + window.mrTabs.unbindEvents(); } + window.mrTabs = new MergeRequestTabs(this.opts); }; MergeRequest.prototype.showAllCommits = function() { |