From 29be165420b1f0a9056e8411d5dd91f18aea1eaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 12:54:28 +0000 Subject: [PATCH 1/2] Bump rubocop-rails from 2.26.2 to 2.27.0 in the rubocop group Bumps the rubocop group with 1 update: [rubocop-rails](https://github.com/rubocop/rubocop-rails). Updates `rubocop-rails` from 2.26.2 to 2.27.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.26.2...v2.27.0) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-minor dependency-group: rubocop ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index d943130b78..6a313d7d98 100644 --- a/Gemfile +++ b/Gemfile @@ -180,7 +180,7 @@ group :development do gem 'rubocop-capybara', '~> 2.21.0' gem 'rubocop-factory_bot', '~> 2.26' gem 'rubocop-minitest', '~> 0.36.0' - gem 'rubocop-rails', '~> 2.26.2' + gem 'rubocop-rails', '~> 2.27.0' # for opening letters gem 'letter_opener', '~> 1.10.0' diff --git a/Gemfile.lock b/Gemfile.lock index 208b47443a..8fe0d3059e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -234,7 +234,7 @@ GEM activesupport (>= 5.0.0) jsbundling-rails (1.3.1) railties (>= 6.0.0) - json (2.7.2) + json (2.7.4) json-jwt (1.16.6) activesupport (>= 4.2) aes_key_wrap @@ -446,7 +446,7 @@ GEM railties (>= 5.2) rexml (3.3.8) rouge (4.4.0) - rubocop (1.66.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -465,7 +465,7 @@ GEM rubocop-minitest (0.36.0) rubocop (>= 1.61, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.26.2) + rubocop-rails (2.27.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.52.0, < 2.0) @@ -630,7 +630,7 @@ DEPENDENCIES rubocop-capybara (~> 2.21.0) rubocop-factory_bot (~> 2.26) rubocop-minitest (~> 0.36.0) - rubocop-rails (~> 2.26.2) + rubocop-rails (~> 2.27.0) ruby-saml (~> 1.17.0) rubyzip (~> 2.3.2) selenium-webdriver (~> 4.25.0) From 3e71631d11ea2e78d970e89a90044c0c2b86da8f Mon Sep 17 00:00:00 2001 From: "jorg.vr" Date: Tue, 29 Oct 2024 10:59:55 +0100 Subject: [PATCH 2/2] Fix linting --- app/models/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index fcd5cadeb2..95f4bfed74 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -85,7 +85,7 @@ def media_path end def commit(msg) - author = if Current.user&.full_name && Current.user&.email + author = if Current.user&.full_name && Current.user.email "#{Current.user.full_name} <#{Current.user.email}>" else 'Dodona '