Skip to content

Commit

Permalink
fixed up a few invalid cop declarations
Browse files Browse the repository at this point in the history
  • Loading branch information
briri committed Jul 13, 2020
1 parent d717e76 commit e59590b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ AllCops:
# Show the name of the cops being voilated in the feedback
DisplayCopNames: true
DisplayStyleGuide: true
Exclude:
- 'bin/**/*'
- 'db/**/*'
- 'vendor/**/*'
- 'node_modules/**/*'
- 'test/**/*'
- 'lib/tasks/*'

# Force no empty lines at the start or end of a block's body. Ignore specs, since this
# improves readability within the RSpec blocks.
Expand Down
4 changes: 2 additions & 2 deletions app/models/settings/template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ class Template < RailsSettings::SettingObject
elsif key == :negative_margin
errors.add(:formatting, _("Margin cannot be negative"))
elsif key == :unknown_margin
# rubocop:disable Style/LineLength
# rubocop:disable Layout/LineLength
errors.add(:formatting, _("Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"))
# rubocop:enable Style/LineLength
# rubocop:enable Layout/LineLength
elsif key == :invalid_font_size
errors.add(:formatting, _("Invalid font size"))
elsif key == :invalid_font_face
Expand Down
4 changes: 2 additions & 2 deletions app/presenters/contributor_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def role_symbol_to_string(symbol:)
end
end

# rubocop:disable Style/LineLength
# rubocop:disable Layout/LineLength
def role_tooltip(symbol:)
case symbol
when :data_curation
Expand All @@ -61,7 +61,7 @@ def role_tooltip(symbol:)
""
end
end
# rubocop:enable Style/LineLength
# rubocop:enable Layout/LineLength

end

Expand Down

0 comments on commit e59590b

Please sign in to comment.