diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 18:08:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 18:08:17 +0000 |
| commit | 219eead23f9feb5da9ec378c451d773aea2dfe61 (patch) | |
| tree | eec14421a05ca8eb79f3cc782abe99532bb6070c /app/views/layouts | |
| parent | 7c38405be9e79099f399aa429503ea7b463bbf5a (diff) | |
| download | gitlab-ce-219eead23f9feb5da9ec378c451d773aea2dfe61.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/fullscreen.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 2b2ffd6abeb..06e3bca99a1 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -2,9 +2,9 @@ - if defined?(nav) && nav = render "layouts/nav/sidebar/#{nav}" .content-wrapper{ class: "#{@content_wrapper_class}" } - = render 'shared/outdated_browser' .mobile-overlay .alert-wrapper + = render 'shared/outdated_browser' = render_if_exists "layouts/header/ee_license_banner" = render "layouts/broadcast" = render "layouts/header/read_only_banner" diff --git a/app/views/layouts/fullscreen.html.haml b/app/views/layouts/fullscreen.html.haml index 8d0775f6f27..63bb9f8fff5 100644 --- a/app/views/layouts/fullscreen.html.haml +++ b/app/views/layouts/fullscreen.html.haml @@ -5,9 +5,9 @@ = render 'peek/bar' = header_message = render partial: "layouts/header/default", locals: { project: @project, group: @group } - = render 'shared/outdated_browser' .mobile-overlay .alert-wrapper + = render 'shared/outdated_browser' = render "layouts/broadcast" = yield :flash_message = render "layouts/flash" |