Rubocop: Style/ElseAlignment enabled
This commit is contained in:
parent
7d48205c1a
commit
647ff6240e
6 changed files with 31 additions and 27 deletions
|
@ -145,7 +145,7 @@ Style/CommentIndentation:
|
|||
Style/ConstantName:
|
||||
Description: 'Constants should use SCREAMING_SNAKE_CASE.'
|
||||
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#screaming-snake-case'
|
||||
Enabled: false
|
||||
Enabled: true
|
||||
|
||||
Style/DefWithParentheses:
|
||||
Description: 'Use def with parentheses when there are arguments.'
|
||||
|
@ -177,7 +177,7 @@ Style/EachWithObject:
|
|||
|
||||
Style/ElseAlignment:
|
||||
Description: 'Align elses and elsifs correctly.'
|
||||
Enabled: false
|
||||
Enabled: true
|
||||
|
||||
Style/EmptyElse:
|
||||
Description: 'Avoid empty else-clauses.'
|
||||
|
|
|
@ -31,10 +31,10 @@ class Projects::RefsController < Projects::ApplicationController
|
|||
|
||||
def logs_tree
|
||||
@offset = if params[:offset].present?
|
||||
params[:offset].to_i
|
||||
else
|
||||
0
|
||||
end
|
||||
params[:offset].to_i
|
||||
else
|
||||
0
|
||||
end
|
||||
|
||||
@limit = 25
|
||||
|
||||
|
|
|
@ -112,12 +112,13 @@ module CommitsHelper
|
|||
person_name = user.nil? ? source_name : user.name
|
||||
person_email = user.nil? ? source_email : user.email
|
||||
|
||||
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: "")
|
||||
%Q{#{avatar} <span class="commit-#{options[:source]}-name">#{person_name}</span>}
|
||||
else
|
||||
person_name
|
||||
end
|
||||
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: "")
|
||||
%Q{#{avatar} <span class="commit-#{options[:source]}-name">#{person_name}</span>}
|
||||
else
|
||||
person_name
|
||||
end
|
||||
|
||||
options = {
|
||||
class: "commit-#{options[:source]}-link has_tooltip",
|
||||
|
|
|
@ -88,11 +88,12 @@ class Commit
|
|||
# cut off, ellipses (`&hellp;`) are prepended to the commit message.
|
||||
def description
|
||||
title_end = safe_message.index("\n")
|
||||
@description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
|
||||
"…".html_safe << safe_message[80..-1]
|
||||
else
|
||||
safe_message.split("\n", 2)[1].try(:chomp)
|
||||
end
|
||||
@description ||=
|
||||
if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
|
||||
"…".html_safe << safe_message[80..-1]
|
||||
else
|
||||
safe_message.split("\n", 2)[1].try(:chomp)
|
||||
end
|
||||
end
|
||||
|
||||
def description?
|
||||
|
|
|
@ -5,11 +5,12 @@ module Projects
|
|||
end
|
||||
|
||||
def execute(note_type, note_id)
|
||||
participating = if note_type && note_id
|
||||
participants_in(note_type, note_id)
|
||||
else
|
||||
[]
|
||||
end
|
||||
participating =
|
||||
if note_type && note_id
|
||||
participants_in(note_type, note_id)
|
||||
else
|
||||
[]
|
||||
end
|
||||
team_members = sorted(@project.team.members)
|
||||
participants = all_members + team_members + participating
|
||||
participants.uniq
|
||||
|
|
|
@ -42,11 +42,12 @@ module ActsAsTaggableOn::Taggable
|
|||
|
||||
elsif options.delete(:any)
|
||||
# get tags, drop out if nothing returned (we need at least one)
|
||||
tags = if options.delete(:wild)
|
||||
ActsAsTaggableOn::Tag.named_like_any(tag_list)
|
||||
else
|
||||
ActsAsTaggableOn::Tag.named_any(tag_list)
|
||||
end
|
||||
tags =
|
||||
if options.delete(:wild)
|
||||
ActsAsTaggableOn::Tag.named_like_any(tag_list)
|
||||
else
|
||||
ActsAsTaggableOn::Tag.named_any(tag_list)
|
||||
end
|
||||
|
||||
return empty_result unless tags.length > 0
|
||||
|
||||
|
|
Loading…
Reference in a new issue