summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-10-19 10:37:42 +0100
committerPhil Hughes <me@iamphill.com>2018-10-19 10:37:42 +0100
commit369bb6fb144d5ff6dca24e7e14ea795deea9bb86 (patch)
tree5e8509ff00a1040c5e01723d79fe5b81d5736e3b /app
parentd76c647797ac7fe55f6f98b4acc1f8f061368e5e (diff)
downloadgitlab-ce-369bb6fb144d5ff6dca24e7e14ea795deea9bb86.tar.gz
Fixed merge request fill tree not respecting fluid width
This fixes a bug where the merge request fill tree would not respect the users fluid width preference. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/merge_request_tabs.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 03f3bb42193..2950c2299ab 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -419,7 +419,7 @@ export default class MergeRequestTabs {
if (this.diffViewType() === 'parallel' || removeLimited) {
$wrapper.removeClass('container-limited');
} else {
- $wrapper.addClass('container-limited');
+ $wrapper.toggleClass('container-limited', this.fixedLayoutPref);
}
}