diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-18 13:50:22 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-18 13:50:22 +0000 |
commit | 8dfa0a76492743edbb4266781c9655aae9564723 (patch) | |
tree | 391923893261a8eaaf3bfe4c6c72b28055849638 /app/helpers | |
parent | e877cfda4de35e594de0e028c247270fcf6034ed (diff) | |
parent | b2e673e523ec0e6ff3d2c27d113e9d6a74a80d7a (diff) | |
download | gitlab-ce-8dfa0a76492743edbb4266781c9655aae9564723.tar.gz |
Merge branch 'improved-issue-sidebar' into 'master'
Improved issue sidebar
Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row.
Closes #13353
See merge request !3097
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/projects_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index b5acb80b720..5473419ef24 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -26,7 +26,7 @@ module ProjectsHelper image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar] end - def link_to_member(project, author, opts = {}) + def link_to_member(project, author, opts = {}, &block) default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" } opts = default_opts.merge(opts) @@ -44,6 +44,8 @@ module ProjectsHelper author_html << content_tag(:span, sanitize(author.name), class: opts[:author_class]) if opts[:name] end + author_html << capture(&block) if block + author_html = author_html.html_safe if opts[:name] |