Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-06 15:02:51 +0300
committerDouwe Maan <douwe@gitlab.com>2016-01-06 15:02:51 +0300
commit384445eca6249363c0da6d8b96e7ee030dc6fab3 (patch)
treec4eedd06e7487a6d5ba68b7e9ce6973b8d85e7f3 /app/helpers/page_layout_helper.rb
parent6d3b5ea2a9611dc7d87bd48043f34f9e0930e052 (diff)
Don't override issue page description in project layout.
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
-rw-r--r--app/helpers/page_layout_helper.rb11
1 files changed, 3 insertions, 8 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 5c0dd36252e..82f805fa444 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -27,11 +27,9 @@ module PageLayoutHelper
#
# Returns an HTML-safe String.
def page_description(description = nil)
- @page_description ||= brand_title
-
if description.present?
@page_description = description.squish
- else
+ elsif @page_description.present?
sanitize(@page_description, tags: []).truncate_words(30)
end
end
@@ -41,11 +39,8 @@ module PageLayoutHelper
subject = @project || @user || @group
- if subject.present?
- subject.avatar_url || default
- else
- default
- end
+ image = subject.avatar_url if subject.present?
+ image || default
end
# Define or get attributes to be used as Twitter card metadata