kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Rubocop: Style/ElseAlignment enabled

This commit is contained in:
Dmitriy Zaporozhets 2015-02-02 21:38:50 -08:00
parent 7d48205c1a
commit 647ff6240e
6 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.rubocop.yml
View File

@ -145,7 +145,7 @@ Style/CommentIndentation:
Style/ConstantName: Style/ConstantName:
Description: 'Constants should use SCREAMING_SNAKE_CASE.' Description: 'Constants should use SCREAMING_SNAKE_CASE.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#screaming-snake-case' StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#screaming-snake-case'
Enabled: false Enabled: true
Style/DefWithParentheses: Style/DefWithParentheses:
Description: 'Use def with parentheses when there are arguments.' Description: 'Use def with parentheses when there are arguments.'
@ -177,7 +177,7 @@ Style/EachWithObject:
Style/ElseAlignment: Style/ElseAlignment:
Description: 'Align elses and elsifs correctly.' Description: 'Align elses and elsifs correctly.'
Enabled: false Enabled: true
Style/EmptyElse: Style/EmptyElse:
Description: 'Avoid empty else-clauses.' Description: 'Avoid empty else-clauses.'

3
app/helpers/commits_helper.rb
View File

@ -112,7 +112,8 @@ module CommitsHelper
person_name = user.nil? ? source_name : user.name person_name = user.nil? ? source_name : user.name
person_email = user.nil? ? source_email : user.email person_email = user.nil? ? source_email : user.email
text = if options[:avatar] text =
if options[:avatar]
avatar = image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "") avatar = image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
%Q{#{avatar} <span class="commit-#{options[:source]}-name">#{person_name}</span>} %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{person_name}</span>}
else else

3
app/models/commit.rb
View File

@ -88,7 +88,8 @@ class Commit
# cut off, ellipses (`&hellp;`) are prepended to the commit message. # cut off, ellipses (`&hellp;`) are prepended to the commit message.
def description def description
title_end = safe_message.index("\n") title_end = safe_message.index("\n")
@description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100) @description ||=
if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
"&hellip;".html_safe << safe_message[80..-1] "&hellip;".html_safe << safe_message[80..-1]
else else
safe_message.split("\n", 2)[1].try(:chomp) safe_message.split("\n", 2)[1].try(:chomp)

3
app/services/projects/participants_service.rb
View File

@ -5,7 +5,8 @@ module Projects
end end
def execute(note_type, note_id) def execute(note_type, note_id)
participating = if note_type && note_id participating =
if note_type && note_id
participants_in(note_type, note_id) participants_in(note_type, note_id)
else else
[] []

3
config/initializers/acts_as_taggable_on_patch.rb
View File

@ -42,7 +42,8 @@ module ActsAsTaggableOn::Taggable
elsif options.delete(:any) elsif options.delete(:any)
# get tags, drop out if nothing returned (we need at least one) # get tags, drop out if nothing returned (we need at least one)
tags = if options.delete(:wild) tags =
if options.delete(:wild)
ActsAsTaggableOn::Tag.named_like_any(tag_list) ActsAsTaggableOn::Tag.named_like_any(tag_list)
else else
ActsAsTaggableOn::Tag.named_any(tag_list) ActsAsTaggableOn::Tag.named_any(tag_list)