summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-07-05 14:31:50 +0000
committerPhil Hughes <me@iamphill.com>2019-07-05 14:31:50 +0000
commit821c2984192f09130a5c3146a25b3b1909375f30 (patch)
tree2cb53b69a28643eb0c00d6547711a0e5452e2e34
parent5ecb2db89e7fb53f95bf7613253dfbfb5705e4d9 (diff)
parent930982cebec7645e139e7f0cd75aa5fc7224fbd0 (diff)
downloadgitlab-ce-821c2984192f09130a5c3146a25b3b1909375f30.tar.gz
Merge branch '12550-fullscrean' into 'master'
Removes EE differences for app/views/layouts/fullscreen.html.haml Closes gitlab-ee#12550 See merge request gitlab-org/gitlab-ce!30403
-rw-r--r--app/views/layouts/fullscreen.html.haml2
-rw-r--r--changelogs/unreleased/12550-fullscrean.yml5
2 files changed, 7 insertions, 0 deletions
diff --git a/app/views/layouts/fullscreen.html.haml b/app/views/layouts/fullscreen.html.haml
index fa04b5be9f2..91a7777514c 100644
--- a/app/views/layouts/fullscreen.html.haml
+++ b/app/views/layouts/fullscreen.html.haml
@@ -3,6 +3,7 @@
= render "layouts/head"
%body{ class: "#{user_application_theme} #{@body_class} fullscreen-layout", data: { page: body_data_page } }
= render 'peek/bar'
+ = header_message
= render partial: "layouts/header/default", locals: { project: @project, group: @group }
= render 'shared/outdated_browser'
.mobile-overlay
@@ -12,3 +13,4 @@
= render "layouts/flash"
.content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch mt-0" }
= yield
+ = footer_message
diff --git a/changelogs/unreleased/12550-fullscrean.yml b/changelogs/unreleased/12550-fullscrean.yml
new file mode 100644
index 00000000000..f20b191f411
--- /dev/null
+++ b/changelogs/unreleased/12550-fullscrean.yml
@@ -0,0 +1,5 @@
+---
+title: Removes EE differences for app/views/layouts/fullscreen.html.haml
+merge_request:
+author:
+type: other