summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-12-05 15:13:35 +0000
committerRémy Coutable <remy@rymai.me>2017-12-05 15:13:35 +0000
commit844d95fb74d0732d4354c4d0ebfdaa5d12e5588e (patch)
tree20716afc70d5be8f74c8a180b063d91996b63878 /app/helpers
parent003a816afa885d56aa1eb4aadbad2b13b1baa25b (diff)
parentb8a393192529015bc2fa9d04c2782cf96e7ec896 (diff)
downloadgitlab-ce-844d95fb74d0732d4354c4d0ebfdaa5d12e5588e.tar.gz
Merge branch 'feature/custom-text-for-new-projects' into 'master'
Add custom brand text on new project pages Closes #15265 See merge request gitlab-org/gitlab-ce!15541
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/appearances_helper.rb20
1 files changed, 8 insertions, 12 deletions
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb
index df590cf47c8..c037de33c22 100644
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -1,30 +1,26 @@
module AppearancesHelper
def brand_title
- if brand_item && brand_item.title
- brand_item.title
- else
- 'GitLab Community Edition'
- end
+ brand_item&.title.presence || 'GitLab Community Edition'
end
def brand_image
- if brand_item.logo?
- image_tag brand_item.logo
- else
- nil
- end
+ image_tag(brand_item.logo) if brand_item&.logo?
end
def brand_text
markdown_field(brand_item, :description)
end
+ def brand_new_project_guidelines
+ markdown_field(brand_item, :new_project_guidelines)
+ end
+
def brand_item
@appearance ||= Appearance.current
end
def brand_header_logo
- if brand_item && brand_item.header_logo?
+ if brand_item&.header_logo?
image_tag brand_item.header_logo
else
render 'shared/logo.svg'
@@ -33,7 +29,7 @@ module AppearancesHelper
# Skip the 'GitLab' type logo when custom brand logo is set
def brand_header_logo_type
- unless brand_item && brand_item.header_logo?
+ unless brand_item&.header_logo?
render 'shared/logo_type.svg'
end
end