Skip to content

Commit

Permalink
Upgrade dependencies (#6864)
Browse files Browse the repository at this point in the history
* Upgrade dependencies

* Rubocop update
  • Loading branch information
ErikSchierboom authored Apr 10, 2024
1 parent 8079cff commit f8747dc
Show file tree
Hide file tree
Showing 17 changed files with 72 additions and 64 deletions.
97 changes: 51 additions & 46 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ GEM
actioncable (>= 6.0)
anycable (~> 1.2.0)
globalid
anyway_config (2.3.1)
ruby-next-core (>= 0.14.0)
anyway_config (2.6.3)
ruby-next-core (~> 1.0)
ast (2.4.2)
aws-eventstream (1.2.0)
aws-partitions (1.759.0)
Expand Down Expand Up @@ -122,7 +122,7 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
backport (1.2.0)
bcrypt (3.1.18)
benchmark (0.2.1)
benchmark (0.3.0)
bindex (0.8.1)
bootsnap (1.16.0)
msgpack (~> 1.2)
Expand Down Expand Up @@ -159,7 +159,7 @@ GEM
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
diff-lcs (1.5.0)
diff-lcs (1.5.1)
discourse_api (1.1.0)
faraday (~> 1.0)
faraday_middleware (~> 1.0)
Expand Down Expand Up @@ -213,13 +213,13 @@ GEM
et-orbi (~> 1, >= 1.2.7)
raabro (~> 1.4)
geocoder (1.8.1)
globalid (1.1.0)
activesupport (>= 5.0)
google-protobuf (3.22.2)
googleapis-common-protos-types (1.5.0)
google-protobuf (~> 3.14)
grpc (1.53.0)
google-protobuf (~> 3.21)
globalid (1.2.1)
activesupport (>= 6.1)
google-protobuf (3.25.3)
googleapis-common-protos-types (1.14.0)
google-protobuf (~> 3.18)
grpc (1.62.0)
google-protobuf (~> 3.25)
googleapis-common-protos-types (~> 1.0)
haml (6.1.1)
temple (>= 0.8.2)
Expand All @@ -241,16 +241,16 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
humanize (2.5.1)
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
jaro_winkler (1.5.4)
jaro_winkler (1.5.6)
jmespath (1.6.2)
jsbundling-rails (1.1.1)
railties (>= 6.0.0)
json (2.6.3)
json (2.7.2)
jwt (2.7.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand All @@ -268,12 +268,13 @@ GEM
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
language_server-protocol (3.17.0.3)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.19.1)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
Expand All @@ -289,8 +290,8 @@ GEM
mime-types-data (3.2023.1003)
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.21.2)
mini_portile2 (2.8.5)
minitest (5.22.3)
minitest-retry (0.2.2)
minitest (>= 5.0)
mocha (2.1.0)
Expand All @@ -310,8 +311,8 @@ GEM
net-smtp (0.3.3)
net-protocol
netrc (0.11.0)
nio4r (2.5.8)
nokogiri (1.15.4)
nio4r (2.7.1)
nokogiri (1.16.3)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oauth2 (2.0.9)
Expand Down Expand Up @@ -350,9 +351,10 @@ GEM
faraday (>= 1.0, < 3)
multi_json
orm_adapter (0.5.0)
parallel (1.22.1)
parser (3.2.1.1)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
racc
parslet (2.0.0)
propshaft (0.4.0)
rails (>= 7.0.0.alpha2)
Expand All @@ -361,8 +363,8 @@ GEM
nio4r (~> 2.0)
qonfig (0.28.0)
raabro (1.4.0)
racc (1.7.1)
rack (2.2.8)
racc (1.7.3)
rack (2.2.9)
rack-attack (6.6.1)
rack (>= 1.0, < 3)
rack-cors (2.0.1)
Expand All @@ -389,11 +391,13 @@ GEM
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
Expand All @@ -406,11 +410,12 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rbs (2.8.4)
recursive-open-struct (1.1.3)
redis (4.8.1)
redis-client (0.17.0)
connection_pool
regexp_parser (2.8.1)
regexp_parser (2.9.0)
responders (3.1.0)
actionpack (>= 5.2)
railties (>= 5.2)
Expand All @@ -428,18 +433,19 @@ GEM
reverse_markdown (2.1.1)
nokogiri
rexml (3.2.6)
rubocop (1.48.1)
rubocop (1.62.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.0.0)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.26.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.0)
parser (>= 3.2.1.0)
rubocop-ast (1.31.2)
parser (>= 3.3.0.4)
rubocop-minitest (0.29.0)
rubocop (>= 1.39, < 2.0)
rubocop-performance (1.16.0)
Expand All @@ -449,7 +455,7 @@ GEM
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
ruby-next-core (0.15.3)
ruby-next-core (1.0.2)
ruby-openai (6.3.0)
event_stream_parser (>= 0.3.0, < 2.0.0)
faraday (>= 1)
Expand Down Expand Up @@ -487,26 +493,27 @@ GEM
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
solargraph (0.48.0)
solargraph (0.50.0)
backport (~> 1.2)
benchmark
bundler (>= 1.17.2)
bundler (~> 2.0)
diff-lcs (~> 1.4)
e2mmap
jaro_winkler (~> 1.5)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
parser (~> 3.0)
reverse_markdown (>= 1.0.5, < 3)
rubocop (>= 0.52)
rbs (~> 2.0)
reverse_markdown (~> 2.0)
rubocop (~> 1.38)
thor (~> 1.0)
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
stripe (8.4.0)
sysexits (1.2.0)
temple (0.10.0)
thor (1.2.1)
tilt (2.1.0)
thor (1.3.1)
tilt (2.3.0)
timeout (0.3.2)
toml (0.3.0)
parslet (>= 1.8.0, < 3.0.0)
Expand All @@ -521,7 +528,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)
uniform_notifier (1.16.0)
version_gem (1.1.2)
warden (1.2.9)
Expand All @@ -535,15 +542,13 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.7.0)
websocket (1.2.9)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.28)
webrick (~> 1.7.0)
yard (0.9.36)
zeitwerk (2.6.8)

PLATFORMS
Expand Down
2 changes: 1 addition & 1 deletion app/commands/submission/representation/process_results.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def handle_generated!
end

def create_notification!
return unless exercise_representation.has_feedback?
return unless exercise_representation.has_feedback? # rubocop:disable Style/RedundantReturn

# TODO: (Required) Create notification about the fact there
# is a piece of automated feedback
Expand Down
3 changes: 2 additions & 1 deletion app/commands/track/update_build_status.rb
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ def test_runner_version = [
def test_runner_version_target
return 1 unless track.has_test_runner?
return 2 if test_runner_version < 2
return 3 if test_runner_version < 3 && track.course?

3 if test_runner_version < 3 && track.course?
end

def representer
Expand Down
3 changes: 2 additions & 1 deletion app/controllers/api/mentoring/discussion_posts_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ def destroy
def use_mentor_discussion
@discussion = Mentor::Discussion.find_by(uuid: params[:discussion_uuid])
return render_404(:mentor_discussion_not_found) unless @discussion
return render_403(:mentor_discussion_not_accessible) unless @discussion.viewable_by_mentor?(current_user)

render_403(:mentor_discussion_not_accessible) unless @discussion.viewable_by_mentor?(current_user)
end
end
2 changes: 1 addition & 1 deletion app/controllers/api/mentoring/testimonials_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ def testimonial_params

def use_testimonial
@testimonial = current_user.mentor_testimonials.find_by(uuid: params[:uuid])
return render_404(:mentor_testimonial_not_found) unless @testimonial
render_404(:mentor_testimonial_not_found) unless @testimonial
end
end
2 changes: 1 addition & 1 deletion app/controllers/api/settings_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ def sudo_update
require(:user).
permit(:handle, :email, :password, :password_confirmation)

return render json: {}, status: :ok if current_user.update(permitted)
render json: {}, status: :ok if current_user.update(permitted)
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ def use_mentor_discussion
return render_404(:mentor_discussion_not_found) unless @discussion

@solution = @discussion.solution
return render_403(:mentor_discussion_not_accessible) unless @solution.user_id == current_user.id
render_403(:mentor_discussion_not_accessible) unless @solution.user_id == current_user.id
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ def use_mentor_discussion
return render_404(:mentor_discussion_not_found) unless @discussion

@solution = @discussion.solution
return render_403(:mentor_discussion_not_accessible) unless @solution.user_id == current_user.id
render_403(:mentor_discussion_not_accessible) unless @solution.user_id == current_user.id
end
end
4 changes: 2 additions & 2 deletions app/controllers/api/solutions/mentor_requests_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ def use_solution
return render_solution_not_found
end

return render_solution_not_accessible unless @solution.user_id == current_user.id
render_solution_not_accessible unless @solution.user_id == current_user.id
end

def use_mentor_request
@mentor_request = @solution.mentor_requests.find_by!(uuid: params[:uuid])

return render_solution_not_accessible unless @mentor_request.solution.user_id == current_user.id
render_solution_not_accessible unless @mentor_request.solution.user_id == current_user.id
end
end
2 changes: 1 addition & 1 deletion app/controllers/mentoring/external_requests_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def show
# Redirect to mentor queue if this is your own request
return redirect_to Exercism::Routes.private_solution_path(@solution) if @solution.user == current_user

return render action: :show_not_mentor unless current_user.mentor?
render action: :show_not_mentor unless current_user.mentor?
end

def accept
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/tracks/exercises_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def edit
end

def no_test_runner
return redirect_to(action: :edit) if @exercise.has_test_runner?
redirect_to(action: :edit) if @exercise.has_test_runner?
end

private
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/view_components/mentor/header.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def automation_tab
class: tab_class(:automation)
) do
graphical_icon(:automation) +
tag.span("Automation") #+
tag.span("Automation") # +
# tag.span(number_with_delimiter(num_representations_without_feedback), class: 'count')
end
end
Expand Down
3 changes: 2 additions & 1 deletion app/serializers/serialize_solution_for_cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ def solution_url
return Exercism::Routes.private_solution_url(solution) if solution.user == requester
return Exercism::Routes.mentoring_discussion_url(discussion) if requester.mentor? && discussion
return Exercism::Routes.mentoring_request_url(mentoring_request) if requester.mentor? && mentoring_request
return Exercism::Routes.published_solution_url(solution) if solution.published?

Exercism::Routes.published_solution_url(solution) if solution.published?
end

def instructions_url
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/assets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Server
def call(env)
path, digest = extract_path_and_digest(env)

esbuild_split_asset = (path.include?('-') && path.ends_with?('.js'))
esbuild_split_asset = path.include?('-') && path.ends_with?('.js')
if (asset = @assembly.load_path.find(path)) && (asset.fresh?(digest) || esbuild_split_asset)
compiled_content = @assembly.compilers.compile(asset)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class API::Solutions::SubmissionAIHelpControllerTest < API::BaseTestCase
type: "too_many_requests",
message: I18n.t('api.errors.too_many_requests'),
usage_type: 'chatgpt',
usage: { "4.0": 10, "3.5": 100 } # rubocop:disable Naming/VariableNumber
usage: { "4.0": 10, "3.5": 100 } # rubocop:disable Naming/VariableNumber
} }
actual = JSON.parse(response.body, symbolize_names: true)
assert_equal expected, actual
Expand Down
Loading

0 comments on commit f8747dc

Please sign in to comment.