diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-29 19:50:08 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-29 19:50:08 +0000 |
| commit | 84113d7e725dcf6f9a3945853475f0cede957fec (patch) | |
| tree | 95d82e602ffe0f52d2e7b579f167ffaaa55d5e9c /app/helpers | |
| parent | 722a6c533a33265214b993122167ff5398e198ea (diff) | |
| parent | 28bafd5354427d27cabe40966bd069a75984e2b1 (diff) | |
| download | gitlab-ce-84113d7e725dcf6f9a3945853475f0cede957fec.tar.gz | |
Merge branch 'rubocop/enable-space-after-cops' into 'master'
Enable Style/SpaceAfterComma and Colon Rubocop cops
See #17478
See merge request !4991
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index e4e8b934bc8..22387d66451 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -52,7 +52,7 @@ module PageLayoutHelper raise ArgumentError, 'cannot provide more than two attributes' if map.length > 2 @page_card_attributes ||= {} - @page_card_attributes = map.reject { |_,v| v.blank? } if map.present? + @page_card_attributes = map.reject { |_, v| v.blank? } if map.present? @page_card_attributes end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index d91e3332e48..26796b08fac 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -15,7 +15,7 @@ module ProjectsHelper def link_to_member_avatar(author, opts = {}) default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" } opts = default_opts.merge(opts) - image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar] + 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 = {}, &block) @@ -27,7 +27,7 @@ module ProjectsHelper author_html = "" # Build avatar image tag - 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] + 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 if opts[:by_username] |