From 7e1ad806d9b82a0e95d27c5aa711ae364c207a18 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 14:30:41 +0000 Subject: [PATCH 1/2] Update rubocop to version 1.56.0 --- Gemfile.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a654d6f2..ab92d81c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,6 +73,7 @@ GEM ast (2.4.2) autoprefixer-rails (10.4.13.0) execjs (~> 2) + base64 (0.1.1) bcrypt (3.1.19) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) @@ -303,7 +304,8 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.54.1) + rubocop (1.56.0) + base64 (~> 0.1.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -311,7 +313,7 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) From ea0c7e6ec74fd719a4297c97fc96066d02c3913b Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Fri, 11 Aug 2023 16:33:49 +0200 Subject: [PATCH 2/2] Correct Style/RedundantReturn lint --- app/models/project.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index b1d9b4bb..14189ef3 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -88,7 +88,8 @@ def active? def joined(user) return false if users.empty? return false unless users.include? user - return true if users.include? user + + true if users.include? user end def join!(user)