diff options
| author | Phil Hughes <me@iamphill.com> | 2019-04-12 09:32:05 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-04-12 09:32:05 +0100 |
| commit | 45ef6fd77710b29dc3fb1d413eb819ad47f154e5 (patch) | |
| tree | 8e9dd1621c81708c7a8511a434274ee27a1edb7d /app/assets/javascripts/diffs/components/app.vue | |
| parent | 39aa68b20c112192fe3aa130a72a004a379a080a (diff) | |
| download | gitlab-ce-45ef6fd77710b29dc3fb1d413eb819ad47f154e5.tar.gz | |
Fixed fluid layout preference not being respected in diffs
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
Diffstat (limited to 'app/assets/javascripts/diffs/components/app.vue')
| -rw-r--r-- | app/assets/javascripts/diffs/components/app.vue | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 5e74998579b..0ed4dcdcd81 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -64,6 +64,11 @@ export default { required: false, default: '', }, + isFluidLayout: { + type: Boolean, + required: false, + default: false, + }, }, data() { const treeWidth = @@ -116,7 +121,7 @@ export default { return this.treeWidth <= TREE_HIDE_STATS_WIDTH; }, isLimitedContainer() { - return !this.showTreeList && !this.isParallelView; + return !this.showTreeList && !this.isParallelView && !this.isFluidLayout; }, }, watch: { |