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:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-05 14:48:21 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-05 14:48:21 +0300
commit14df110b78e0fb7f6e45fff5e4ce65ef2d91ea60 (patch)
treee5fc0325f247e002689f3ccd0c774c5bab15ce0c /app/helpers
parentefe7a6b04c5706a887db0edc02be7ac6650cb979 (diff)
parent9cae8dbbfb990f929da08fb75657596a72f85fc0 (diff)
Merge branch 'issue-sidebar-mobile' into 'master'
Issue sidebar mobile Fixes #13592 Fixes #14037 See merge request !3050
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/projects_helper.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index d6fb629b0c2..c8061fcdc59 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -38,12 +38,16 @@ module ProjectsHelper
author_html << image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar]
# Build name span tag
- author_html << content_tag(:span, sanitize(author.name), class: opts[:author_class]) if opts[:name]
+ if opts[:by_username]
+ author_html << content_tag(:span, sanitize("@#{author.username}"), class: opts[:author_class]) if opts[:name]
+ else
+ author_html << content_tag(:span, sanitize(author.name), class: opts[:author_class]) if opts[:name]
+ end
author_html = author_html.html_safe
if opts[:name]
- link_to(author_html, user_path(author), class: "author_link").html_safe
+ link_to(author_html, user_path(author), class: "author_link #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
else
title = opts[:title].sub(":name", sanitize(author.name))
link_to(author_html, user_path(author), class: "author_link has_tooltip", data: { 'original-title'.to_sym => title, container: 'body' } ).html_safe