Skip to content

Commit

Permalink
rubocop: upgrade to 0.55
Browse files Browse the repository at this point in the history
  • Loading branch information
dunn committed Apr 30, 2018
1 parent bf450b9 commit e2e7759
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 14 deletions.
1 change: 0 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require: rubocop-rspec

inherit_from: .rubocop_todo.yml

AllCops:
Expand Down
9 changes: 1 addition & 8 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
# using RuboCop version 0.53.0.
# using RuboCop version 0.55.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -130,13 +130,6 @@ RSpec/VerifiedDoubles:
- 'spec/inputs/controlled_vocabulary_select_input_spec.rb'
- 'spec/inputs/relator_input_spec.rb'

# Offense count: 1
# Configuration parameters: Include.
# Include: app/models/**/*.rb
Rails/InverseOf:
Exclude:
- 'app/models/concerns/with_admin_policy.rb'

# Offense count: 2
# Configuration parameters: Include.
# Include: app/controllers/**/*.rb
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ group :development, :test do
gem "poltergeist"
gem "rspec-activemodel-mocks"
gem "rspec-rails"
gem "rubocop", "~> 0.53.0", require: false
gem "rubocop", "~> 0.53", require: false
gem "rubocop-rspec", require: false
gem "spring"
gem "spring-commands-rspec", group: :development
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ GEM
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rubocop (0.53.0)
rubocop (0.55.0)
parallel (~> 1.10)
parser (>= 2.5)
powerpack (~> 0.1)
Expand Down Expand Up @@ -897,7 +897,7 @@ DEPENDENCIES
rsolr
rspec-activemodel-mocks
rspec-rails
rubocop (~> 0.53.0)
rubocop (~> 0.53)
rubocop-rspec
sass-rails (~> 5.0)
settingslogic
Expand Down
4 changes: 2 additions & 2 deletions app/models/time_span.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ def as_array
end

def earliest_year
start.reject(&:blank?).sort do |a, b|
start.reject(&:blank?).min do |a, b|
extract_year(a) <=> extract_year(b)
end.first
end
end

private
Expand Down

0 comments on commit e2e7759

Please sign in to comment.