diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-07 21:42:41 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-07 21:42:41 +0100 |
| commit | 59195b98d3dfef31915c901e86f91cec74d5fbfa (patch) | |
| tree | b0eba5f79fdb835c838d75d1d0ff29a261b11387 /app/views/layouts/_page.html.haml | |
| parent | 436047f6575ffc64f065928d1feb4144ca8f7158 (diff) | |
| parent | 69e17c225e53feaa7449e468e89aca3f084ab9f9 (diff) | |
| download | gitlab-ce-59195b98d3dfef31915c901e86f91cec74d5fbfa.tar.gz | |
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'app/views/layouts/_page.html.haml')
| -rw-r--r-- | app/views/layouts/_page.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index f2c16d82d4f..e90197320f2 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -12,10 +12,13 @@ .content-wrapper{ class: "#{(layout_nav_class unless show_new_nav?)}" } .alert-wrapper = render "layouts/broadcast" + - if show_new_nav? + - if content_for?(:new_global_flash) + = yield :new_global_flash + - unless @hide_breadcrumbs + = render "layouts/nav/breadcrumbs" = render "layouts/flash" = yield :flash_message - - if show_new_nav? && !@hide_breadcrumbs - = render "layouts/nav/breadcrumbs" %div{ class: "#{(container_class unless @no_container)} #{@content_class}" } .content{ id: "content-body" } = yield |