diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-03-23 07:36:22 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-03-23 07:36:22 +0300 |
| commit | 453b5c1c12ecc34f2aca7df021bfc451fefab095 (patch) | |
| tree | a49f39e6332accd3ce5df794dd921cd0a35200ab /app | |
| parent | be0ce05c5d07b0b27be243f0a3d57b662dcab1af (diff) | |
| parent | 9ab43aa762d2f0b69a400da0d9e992f232179002 (diff) | |
Merge branch 'tc-re-add-read-only-banner' into 'master'
Add read-only banner to all pages
Closes #43937
See merge request gitlab-org/gitlab-ce!17798
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/application_controller.rb | 14 | ||||
| -rw-r--r-- | app/helpers/application_helper.rb | 7 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/header/_read_only_banner.html.haml | 7 |
4 files changed, 15 insertions, 14 deletions
diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb index c27f2ee3c09..a4648b33cfa 100644 --- a/app/controllers/admin/application_controller.rb +++ b/app/controllers/admin/application_controller.rb @@ -3,23 +3,9 @@ # Automatically sets the layout and ensures an administrator is logged in class Admin::ApplicationController < ApplicationController before_action :authenticate_admin! - before_action :display_read_only_information layout 'admin' def authenticate_admin! render_404 unless current_user.admin? end - - def display_read_only_information - return unless Gitlab::Database.read_only? - - flash.now[:notice] = read_only_message - end - - private - - # Overridden in EE - def read_only_message - _('You are on a read-only GitLab instance.') - end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3ddf8eb3369..701be97ee96 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -323,4 +323,11 @@ module ApplicationHelper def locale_path asset_path("locale/#{Gitlab::I18n.locale}/app.js") end + + # Overridden in EE + def read_only_message + return unless Gitlab::Database.read_only? + + _('You are on a read-only GitLab instance.') + end end diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index f0963cf9da8..f67a8878c80 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -6,6 +6,7 @@ .mobile-overlay .alert-wrapper = render "layouts/broadcast" + = render 'layouts/header/read_only_banner' = yield :flash_message - unless @hide_breadcrumbs = render "layouts/nav/breadcrumbs" diff --git a/app/views/layouts/header/_read_only_banner.html.haml b/app/views/layouts/header/_read_only_banner.html.haml new file mode 100644 index 00000000000..f3d563c362f --- /dev/null +++ b/app/views/layouts/header/_read_only_banner.html.haml @@ -0,0 +1,7 @@ +- message = read_only_message +- if message + .flash-container.flash-container-page + .flash-notice + %div{ class: (container_class) } + %span + = message |