Commit a5cb09a3d9f5ea76c5708eec7e9d8cd7a2f8c4fe
1 parent
8937f088
Exists in
master
and in
1 other branch
Rubocop: multiple lines of arguments only indented one level
Showing
5 changed files
with
11 additions
and
18 deletions
Show diff stats
.rubocop.yml
@@ -25,3 +25,6 @@ Style/IndentationConsistency: | @@ -25,3 +25,6 @@ Style/IndentationConsistency: | ||
25 | 25 | ||
26 | Style/AccessModifierIndentation: | 26 | Style/AccessModifierIndentation: |
27 | EnforcedStyle: outdent | 27 | EnforcedStyle: outdent |
28 | + | ||
29 | +Style/AlignParameters: | ||
30 | + EnforcedStyle: with_fixed_indentation |
.rubocop_todo.yml
@@ -64,16 +64,6 @@ Style/AlignHash: | @@ -64,16 +64,6 @@ Style/AlignHash: | ||
64 | - 'spec/controllers/problems_controller_spec.rb' | 64 | - 'spec/controllers/problems_controller_spec.rb' |
65 | - 'spec/models/problem_spec.rb' | 65 | - 'spec/models/problem_spec.rb' |
66 | 66 | ||
67 | -# Offense count: 6 | ||
68 | -# Cop supports --auto-correct. | ||
69 | -# Configuration parameters: EnforcedStyle, SupportedStyles. | ||
70 | -Style/AlignParameters: | ||
71 | - Exclude: | ||
72 | - - 'app/helpers/apps_helper.rb' | ||
73 | - - 'app/models/app.rb' | ||
74 | - - 'app/models/notification_services/gtalk_service.rb' | ||
75 | - - 'config/initializers/devise.rb' | ||
76 | - | ||
77 | # Offense count: 105 | 67 | # Offense count: 105 |
78 | # Cop supports --auto-correct. | 68 | # Cop supports --auto-correct. |
79 | # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods. | 69 | # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods. |
app/decorators/issue_tracker_field_decorator.rb
@@ -13,8 +13,8 @@ class IssueTrackerFieldDecorator < Draper::Decorator | @@ -13,8 +13,8 @@ class IssueTrackerFieldDecorator < Draper::Decorator | ||
13 | 13 | ||
14 | def input(form, issue_tracker) | 14 | def input(form, issue_tracker) |
15 | form.send(input_field, key.to_s, | 15 | form.send(input_field, key.to_s, |
16 | - :placeholder => field_info[:placeholder], | ||
17 | - :value => issue_tracker.options[key.to_s]) | 16 | + :placeholder => field_info[:placeholder], |
17 | + :value => issue_tracker.options[key.to_s]) | ||
18 | end | 18 | end |
19 | 19 | ||
20 | private def input_field | 20 | private def input_field |
app/helpers/apps_helper.rb
@@ -2,11 +2,11 @@ module AppsHelper | @@ -2,11 +2,11 @@ module AppsHelper | ||
2 | def link_to_copy_attributes_from_other_app | 2 | def link_to_copy_attributes_from_other_app |
3 | if App.count > 1 | 3 | if App.count > 1 |
4 | html = link_to('copy settings from another app', '#', | 4 | html = link_to('copy settings from another app', '#', |
5 | - :class => 'button copy_config') | 5 | + :class => 'button copy_config') |
6 | html << select("duplicate", "app", | 6 | html << select("duplicate", "app", |
7 | - App.all.asc(:name).reject{|a| a == @app }. | ||
8 | - collect{|p| [ p.name, p.id ] }, {:include_blank => "[choose app]"}, | ||
9 | - {:class => "choose_other_app", :style => "display: none;"}) | 7 | + App.all.asc(:name).reject{|a| a == @app }. |
8 | + collect{|p| [ p.name, p.id ] }, {:include_blank => "[choose app]"}, | ||
9 | + {:class => "choose_other_app", :style => "display: none;"}) | ||
10 | return html | 10 | return html |
11 | end | 11 | end |
12 | end | 12 | end |
app/models/notification_services/gtalk_service.rb
@@ -30,8 +30,8 @@ class NotificationServices::GtalkService < NotificationService | @@ -30,8 +30,8 @@ class NotificationServices::GtalkService < NotificationService | ||
30 | def check_params | 30 | def check_params |
31 | if Fields.detect { |f| self[f[0]].blank? && self[f[2]].blank? } | 31 | if Fields.detect { |f| self[f[0]].blank? && self[f[2]].blank? } |
32 | errors.add :base, | 32 | errors.add :base, |
33 | - """You must specify your Username, Password, service, service_url | ||
34 | - and either rooms or users to send to or both""" | 33 | + """You must specify your Username, Password, service, service_url |
34 | + and either rooms or users to send to or both""" | ||
35 | end | 35 | end |
36 | end | 36 | end |
37 | 37 |