Skip to content

Commit

Permalink
Bump rubocop-rails from 2.22.2 to 2.23.0 (#518)
Browse files Browse the repository at this point in the history
* Bump rubocop-rails from 2.22.2 to 2.23.0

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.22.2 to 2.23.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop-rails@v2.22.2...v2.23.0)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update gemset.nix

* Run rubocop

* Update gemset.nix

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Charlotte Van Petegem <[email protected]>
Co-authored-by: chvp <[email protected]>
  • Loading branch information
4 people authored Dec 17, 2023
1 parent 8fa87c5 commit a105575
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ group :development do
gem 'annotate', '~> 3.2' # Remove workaround in lib/tasks/annotate.rb when https://github.com/ctran/annotate_models/issues/696 is fixed
gem 'rubocop-factory_bot', '~> 2.24'
gem 'rubocop-minitest', '~> 0.33.0'
gem 'rubocop-rails', '~> 2.22'
gem 'rubocop-rails', '~> 2.23'
end
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ GEM
rubocop (~> 1.33)
rubocop-minitest (0.33.0)
rubocop (>= 1.39, < 2.0)
rubocop-rails (2.22.2)
rubocop-rails (2.23.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
Expand Down Expand Up @@ -301,7 +301,7 @@ DEPENDENCIES
rails (~> 7.1)
rubocop-factory_bot (~> 2.24)
rubocop-minitest (~> 0.33.0)
rubocop-rails (~> 2.22)
rubocop-rails (~> 2.23)
simplecov (~> 0.21)
tzinfo-data
wahwah (~> 1.5.1)
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ def add_pagination_headers(collection)
def authenticate_from_token
token = AuthToken.find_authenticated(
{
secret: (request.headers[:'x-secret'] || params[:secret]),
device_id: (request.headers[:'x-device-id'] || params[:device_id])
secret: request.headers[:'x-secret'] || params[:secret],
device_id: request.headers[:'x-device-id'] || params[:device_id]
}
)
self.current_user = token&.user
Expand Down
6 changes: 3 additions & 3 deletions app/models/concerns/has_normalized.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ module HasNormalized
class_methods do
def normalized_col_generator(col_name)
col = col_name.to_sym
normalized_col = "normalized_#{col_name}".to_sym
generate_normalized_col = "generate_normalized_#{col_name}".to_sym
col_changed = "#{col_name}_changed?".to_sym
normalized_col = :"normalized_#{col_name}"
generate_normalized_col = :"generate_normalized_#{col_name}"
col_changed = :"#{col_name}_changed?"

set_callback :validation, :before, generate_normalized_col, if: col_changed

Expand Down
4 changes: 2 additions & 2 deletions gemset.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a105575

Please sign in to comment.