Commit 1effb0a8 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'ee-default-brand-title' into 'master'

EE: Move default brand title to a method

See merge request gitlab-org/gitlab-ee!8735
parents ac44c83a 058a5433
...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
module AppearancesHelper module AppearancesHelper
def brand_title def brand_title
current_appearance&.title.presence || 'GitLab Enterprise Edition' current_appearance&.title.presence || default_brand_title
end
def default_brand_title
# This resides in a separate method so that EE can easily redefine it.
'GitLab Community Edition'
end end
def brand_image def brand_image
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
module EE module EE
module AppearancesHelper module AppearancesHelper
extend ::Gitlab::Utils::Override
def header_message def header_message
return unless current_appearance&.show_header? return unless current_appearance&.show_header?
...@@ -17,6 +19,11 @@ module EE ...@@ -17,6 +19,11 @@ module EE
render_message(:footer_message) render_message(:footer_message)
end end
override :default_brand_title
def default_brand_title
'GitLab Enterprise Edition'
end
private private
def render_message(field_sym, class_names = []) def render_message(field_sym, class_names = [])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment