diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-11 08:43:10 +0200 |
|---|---|---|
| committer | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-11 08:43:10 +0200 |
| commit | a2f7936c74e6c9c4eed7b1c5641f0c43d4ff1375 (patch) | |
| tree | 82b1ea27fe2a9a1be884467e10d9bde688ce97d1 /app/views/layouts | |
| parent | bfd2181310097f5c0a92a43ffc2b7b9540b96ad3 (diff) | |
| parent | 2f990e3408d00cad473d8dcf8a4e49155cc3cc33 (diff) | |
| download | gitlab-ce-a2f7936c74e6c9c4eed7b1c5641f0c43d4ff1375.tar.gz | |
merge master and resolve conflicts
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_page.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index f67a8878c80..a41d30da450 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -8,6 +8,7 @@ = render "layouts/broadcast" = render 'layouts/header/read_only_banner' = yield :flash_message + = render "shared/ping_consent" - unless @hide_breadcrumbs = render "layouts/nav/breadcrumbs" = render "layouts/flash" |