summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-05 14:54:59 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-01-05 14:54:59 -0500
commit43053c2e6f03ad60f85728f36c46588979f68024 (patch)
tree36c7234134d76bc98092973c3f0b6774e049490b /app/helpers
parenta298f694327b1241fc0d06618228e3750c20c5a1 (diff)
downloadgitlab-ce-43053c2e6f03ad60f85728f36c46588979f68024.tar.gz
Make `page_description` less magical :sparkles:
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/page_layout_helper.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index f2a4afebbd1..5c0dd36252e 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -27,7 +27,7 @@ module PageLayoutHelper
#
# Returns an HTML-safe String.
def page_description(description = nil)
- @page_description ||= page_description_default
+ @page_description ||= brand_title
if description.present?
@page_description = description.squish
@@ -36,16 +36,6 @@ module PageLayoutHelper
end
end
- # Default value for page_description when one hasn't been defined manually by
- # a view
- def page_description_default
- if @project
- @project.description || brand_title
- else
- brand_title
- end
- end
-
def page_image
default = image_url('gitlab_logo.png')