diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-19 14:07:17 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-19 14:07:17 +0300 |
| commit | c45de884be8a1517ef0daa6c02339e7ec992f1ad (patch) | |
| tree | c683817d202cc7b8d89fe096ada4a54e2da6b914 /app | |
| parent | ffc505d2170fff93607e37f3a634984b90549436 (diff) | |
| parent | 369bb6fb144d5ff6dca24e7e14ea795deea9bb86 (diff) | |
Merge branch 'mr-file-tree-inline-fluid-width-fix' into 'master'
Fixed merge request fill tree not respecting fluid width
Closes #52916
See merge request gitlab-org/gitlab-ce!22487
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 2 |
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); } } |