Merge pull request #5414 from dodona-edu/dependabot/bundler/rubocop-3…

…1132a1704

Bump the rubocop group with 1 update

Gemfile

@@ -180,7 +180,7 @@ group :development do
   gem 'rubocop-capybara', '~> 2.20.0'
   gem 'rubocop-factory_bot', '~> 2.25'
   gem 'rubocop-minitest', '~> 0.34.5'
-  gem 'rubocop-rails', '~> 2.23.1'
+  gem 'rubocop-rails', '~> 2.24.0'
 
   # for opening letters
   gem 'letter_opener', '~> 1.9.0'

Gemfile.lock

@@ -175,8 +175,7 @@ GEM
     docker-api (2.2.0)
       excon (>= 0.47.0)
       multi_json
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     ed25519 (1.3.0)
     erubi (1.12.0)
     exception_notification (4.5.0)
@@ -441,7 +440,7 @@ GEM
       railties (>= 5.2)
     rexml (3.2.6)
     rouge (4.2.0)
-    rubocop (1.60.2)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -452,20 +451,20 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
     rubocop-minitest (0.34.5)
       rubocop (>= 1.39, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.23.1)
+    rubocop-rails (2.24.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     ruby-saml (1.16.0)
       nokogiri (>= 1.13.10)
@@ -628,7 +627,7 @@ DEPENDENCIES
   rubocop-capybara (~> 2.20.0)
   rubocop-factory_bot (~> 2.25)
   rubocop-minitest (~> 0.34.5)
-  rubocop-rails (~> 2.23.1)
+  rubocop-rails (~> 2.24.0)
   ruby-saml (~> 1.16.0)
   rubyzip (~> 2.3.2)
   selenium-webdriver (~> 4.18.1)

app/models/activity.rb

@@ -323,8 +323,8 @@ def accessible?(user, course)
         return false unless course.visible_activities.pluck(:id).include? id
       end
       return true if user&.zeus?
-      return false unless access_public? \
-          || repository.allowed_courses.pluck(:id).include?(course&.id)
+      return false unless access_public? ||
+                          repository.allowed_courses.pluck(:id).include?(course&.id)
       return true if user&.course_admin? course
       return false if draft?
       return true if user&.member_of?(course)

app/models/user.rb

@@ -395,8 +395,8 @@ def merge_into(other, force: false, force_institution: false)
     return false if errors.any?
 
     transaction do
-      other.permission = permission if (permission == 'staff' && other.permission == 'student') \
-                                    || (permission == 'zeus' && other.permission != 'zeus')
+      other.permission = permission if (permission == 'staff' && other.permission == 'student') ||
+                                       (permission == 'zeus' && other.permission != 'zeus')
 
       other.institution_id = institution_id if other.institution_id.nil?