Skip to content

Commit

Permalink
Merge pull request #1643 from etalab/dependabot/bundler/rubocop-c8cdf…
Browse files Browse the repository at this point in the history
…43e8e

Bump rubocop-rails from 2.25.1 to 2.26.0 in the rubocop group
  • Loading branch information
skelz0r authored Aug 27, 2024
2 parents a5d6ebf + 0d2879e commit 44f3a7c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ GEM
actionpack (>= 4.2)
omniauth (~> 2.0)
optimist (3.1.0)
parallel (1.26.2)
parallel (1.26.3)
parser (3.3.4.2)
ast (~> 2.4.1)
racc
Expand Down Expand Up @@ -458,16 +458,16 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.0)
rubocop-ast (1.32.1)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.26.1)
rubocop (~> 1.61)
rubocop-rails (2.25.1)
rubocop-rails (2.26.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (3.0.4)
rubocop (~> 1.61)
Expand Down
2 changes: 1 addition & 1 deletion app/lib/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,6 @@ def create_user_authorization_request_role(params = {})
end

def load_all_models!
Dir[Rails.root.join('app/models/**/*.rb')].each { |f| require f }
Rails.root.glob('app/models/**/*.rb').each { |f| require f }
end
end
2 changes: 1 addition & 1 deletion app/models/abstract_blog_post.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ def self.all
end

def self.blog_posts_files
Dir[Rails.root.join('config/blog_posts', api, '*.md')]
Rails.root.glob("config/blog_posts/#{api}/*.md")
end
end
2 changes: 1 addition & 1 deletion app/models/prolong_token_wizard.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class ProlongTokenWizard < ApplicationRecord
delegate :prolong!, to: :token
delegate :authorization_request, to: :token

enum status: {
enum :status, {
owner: 0,
project_purpose: 10,
contacts: 20,
Expand Down
4 changes: 2 additions & 2 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.

# Require helpers files containing factories
Dir[Rails.root.join('spec/helpers/**/*.rb')].each { |f| require f }
Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
Rails.root.glob('spec/helpers/**/*.rb').each { |f| require f }
Rails.root.glob('spec/support/**/*.rb').each { |f| require f }

# Checks for pending migration and applies them before tests are run.
# If you are not using ActiveRecord, you can remove this line.
Expand Down

0 comments on commit 44f3a7c

Please sign in to comment.