Skip to content

Commit

Permalink
Merge pull request #5901 from dodona-edu/dependabot/bundler/rubocop-e…
Browse files Browse the repository at this point in the history
…87bb9de81
  • Loading branch information
bmesuere authored Oct 29, 2024
2 parents 4981cf2 + 3e71631 commit 61496da
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -446,7 +446,7 @@ GEM
railties (>= 5.2)
rexml (3.3.9)
rouge (4.4.0)
rubocop (1.66.1)
rubocop (1.67.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/models/repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>'
Expand Down

0 comments on commit 61496da

Please sign in to comment.