From a10557561f6a19489f9dfa09daf28b0815a2f8a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 17 Dec 2023 10:52:13 +0100
Subject: [PATCH] Bump rubocop-rails from 2.22.2 to 2.23.0 (#518)

* 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](https://github.com/rubocop/rubocop-rails/compare/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] <support@github.com>

* Update gemset.nix

* Run rubocop

* Update gemset.nix

---------

Signed-off-by: dependabot[bot] <support@github.com>
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 <charlotte@vanpetegem.me>
Co-authored-by: chvp <chvp@users.noreply.github.com>
---
 Gemfile                                   | 2 +-
 Gemfile.lock                              | 4 ++--
 app/controllers/application_controller.rb | 4 ++--
 app/models/concerns/has_normalized.rb     | 6 +++---
 gemset.nix                                | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 117a11cd..100c456e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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
diff --git a/Gemfile.lock b/Gemfile.lock
index 743bd7bd..c9e33810 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
@@ -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)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2af78545..0f0dab5e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -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
diff --git a/app/models/concerns/has_normalized.rb b/app/models/concerns/has_normalized.rb
index c24ff10c..0cc3e13e 100644
--- a/app/models/concerns/has_normalized.rb
+++ b/app/models/concerns/has_normalized.rb
@@ -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
 
diff --git a/gemset.nix b/gemset.nix
index cb21d0d4..00a1eb5a 100644
--- a/gemset.nix
+++ b/gemset.nix
@@ -940,10 +940,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ym0h2w97b8c2h6zl44m22lzg253qkmim0ali32aiy58ddvbj0mm";
+      sha256 = "0vdbzk5kzjqgwvcpnrn1b6livbyaw12qq0pivf0m55wkyya0m71d";
       type = "gem";
     };
-    version = "2.22.2";
+    version = "2.23.0";
   };
   ruby-progressbar = {
     groups = ["default" "development"];