From 43053c2e6f03ad60f85728f36c46588979f68024 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 5 Jan 2016 14:54:59 -0500
Subject: Make `page_description` less magical :sparkles:

---
 app/helpers/page_layout_helper.rb | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'app/helpers')

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')
 
-- 
cgit v1.2.1