Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade: Bump rubocop-rails from 2.25.1 to 2.26.0 #4785

Merged
merged 2 commits into from
Aug 27, 2024
Merged

Upgrade: Bump rubocop-rails from 2.25.1 to 2.26.0 #4785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fff4d9
Upgrade: Bump rubocop-rails from 2.25.1 to 2.26.0
dependabot[bot] Aug 26, 2024
f1ddd0e
Chore: Fix new linting errors from bump
KevinMulhern Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ group :development do
gem 'rack-mini-profiler'
gem 'rubocop', '~> 1.61', require: false
gem 'rubocop-performance', '~> 1.19', require: false
gem 'rubocop-rails', '~> 2.25', require: false
gem 'rubocop-rails', '~> 2.26', require: false
gem 'rubocop-rspec', '~> 2.25', require: false
gem 'web-console', '~> 4.2'
end
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ GEM
omniauth (~> 2.0)
orm_adapter (0.5.0)
pagy (9.0.5)
parallel (1.26.1)
parallel (1.26.3)
parallel_tests (4.7.1)
parallel
parser (3.3.4.2)
Expand Down Expand Up @@ -482,7 +482,7 @@ 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)
Expand All @@ -491,10 +491,10 @@ GEM
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
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 (2.31.0)
rubocop (~> 1.40)
Expand Down Expand Up @@ -647,7 +647,7 @@ DEPENDENCIES
rspec_junit_formatter (~> 0.6)
rubocop (~> 1.61)
rubocop-performance (~> 1.19)
rubocop-rails (~> 2.25)
rubocop-rails (~> 2.26)
rubocop-rspec (~> 2.25)
ruby-progressbar (~> 1.13)
scenic (~> 1.8)
Expand Down
4 changes: 2 additions & 2 deletions app/models/flag.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class Flag < ApplicationRecord
validates :resolved_by_id, presence: true, if: -> { status == 'resolved' }

enum reason: REASONS.each_with_object({}) { |reason, hash| hash[reason.name] = reason.value }
enum status: { active: 0, resolved: 1 }
enum action_taken: { pending: 0, dismiss: 1, ban: 2, removed_project_submission: 3, notified_user: 4 }
enum :status, { active: 0, resolved: 1 }
enum :action_taken, { pending: 0, dismiss: 1, ban: 2, removed_project_submission: 3, notified_user: 4 }

scope :by_status, ->(status) { where(status:) }
scope :count_for, ->(status) { by_status(status).count }
Expand Down
2 changes: 1 addition & 1 deletion spec/rails_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
abort('The Rails environment is running in production mode!') if Rails.env.production?
require 'rspec/rails'

Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
Rails.root.glob('spec/support/**/*.rb').each { |f| require f }
ActiveRecord::Migration[6.0].maintain_test_schema!

require 'dotenv'
Expand Down