Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump the rubocop group across 1 directory with 2 updates #5776

Merged
merged 3 commits into from
Sep 16, 2024
Merged

Bump the rubocop group across 1 directory with 2 updates #5776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0643454
Bump the rubocop group across 1 directory with 2 updates
dependabot[bot] Sep 16, 2024
55508a1
Merge branch 'main' into dependabot/bundler/rubocop-0d30e6d2e4
jorg-vr Sep 16, 2024
8cfb337
Fix return from ensure
jorg-vr Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ group :development do
gem 'rb-readline', '~> 0.5.5' # require for irb
gem 'rubocop-capybara', '~> 2.21.0'
gem 'rubocop-factory_bot', '~> 2.26'
gem 'rubocop-minitest', '~> 0.35.1'
gem 'rubocop-rails', '~> 2.26.0'
gem 'rubocop-minitest', '~> 0.36.0'
gem 'rubocop-rails', '~> 2.26.1'

# for opening letters
gem 'letter_opener', '~> 1.10.0'
Expand Down
21 changes: 10 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ GEM
csv
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
i18n-js (4.2.3)
glob (>= 0.4.0)
Expand Down Expand Up @@ -351,7 +351,7 @@ GEM
webfinger (~> 2.0)
orm_adapter (0.5.0)
parallel (1.26.3)
parser (3.3.4.2)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
premailer (1.18.0)
Expand Down Expand Up @@ -443,27 +443,26 @@ GEM
railties (>= 5.2)
rexml (3.3.7)
rouge (4.3.0)
rubocop (1.65.1)
rubocop (1.66.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.1)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.26.1)
rubocop (~> 1.61)
rubocop-minitest (0.35.1)
rubocop-minitest (0.36.0)
rubocop (>= 1.61, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.26.0)
rubocop-rails (2.26.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
Expand Down Expand Up @@ -526,7 +525,7 @@ GEM
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
uri (0.13.0)
useragent (0.16.10)
validate_url (1.0.15)
Expand Down Expand Up @@ -627,8 +626,8 @@ DEPENDENCIES
rouge (= 4.3.0)
rubocop-capybara (~> 2.21.0)
rubocop-factory_bot (~> 2.26)
rubocop-minitest (~> 0.35.1)
rubocop-rails (~> 2.26.0)
rubocop-minitest (~> 0.36.0)
rubocop-rails (~> 2.26.1)
ruby-saml (~> 1.17.0)
rubyzip (~> 2.3.2)
selenium-webdriver (~> 4.24.0)
Expand Down
4 changes: 3 additions & 1 deletion app/runners/submission_runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,9 @@ def run
finalize
@time_messages << build_message(format('<strong>Total time:</strong> %<time>.2f seconds', time: (Time.zone.now - @start)), 'zeus', 'html')
result[:messages]&.concat @time_messages
result
# By placing the return here, we also silence the warning (ie, no exception can be caught in surrounding code)
# Instead the normal flow will be followed with the following return value
return result # rubocop:disable Lint/EnsureReturn
end

private
Expand Down