summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/show.html.haml
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-04-12 09:32:05 +0100
committerPhil Hughes <me@iamphill.com>2019-04-12 09:32:05 +0100
commit45ef6fd77710b29dc3fb1d413eb819ad47f154e5 (patch)
tree8e9dd1621c81708c7a8511a434274ee27a1edb7d /app/views/projects/merge_requests/show.html.haml
parent39aa68b20c112192fe3aa130a72a004a379a080a (diff)
downloadgitlab-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/views/projects/merge_requests/show.html.haml')
-rw-r--r--app/views/projects/merge_requests/show.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index 5111c9fab8d..79c586eef73 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -82,7 +82,8 @@
help_page_path: suggest_changes_help_path,
current_user_data: UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json,
project_path: project_path(@merge_request.project),
- changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg') } }
+ changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg'),
+ is_fluid_layout: fluid_layout.to_s } }
.mr-loading-status
= spinner