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

Upgrade ruby to 3.3.6 #5952

Merged
merged 5 commits into from
Jan 3, 2025
Merged

Upgrade ruby to 3.3.6 #5952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecc6842
Upgrade ruby
jorg-vr Nov 20, 2024
e3a9aa3
Remove premailer
jorg-vr Nov 20, 2024
fecd83b
Remove mail as fixed dependency as it is depended upon in the same ve…
jorg-vr Nov 20, 2024
a7a86b0
Reintroduce premailer
jorg-vr Nov 20, 2024
9801a3e
Merge branch 'main' into chore/upgrade-ruby
jorg-vr Dec 20, 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
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ AllCops:
- "db/**/*"
- "vendor/**/*"
- "node_modules/**/*"
TargetRubyVersion: 3.1
TargetRubyVersion: 3.3.6
NewCops: enable

Layout/FirstArrayElementIndentation:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.3.6
6 changes: 2 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '~> 3.1.2'
ruby '~> 3.3.6'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.2.2'
Expand Down Expand Up @@ -79,9 +79,6 @@ gem 'jwt', '~> 2.9.3'
gem 'hcaptcha', '~> 7.1.0'
gem 'mail_form', '~> 1.10.1'

# set fixed to keep an old version until https://github.com/mikel/mail/issues/1538 is fixed
gem 'mail', '~> 2.8.1'

# authorization
gem 'pundit', '~> 2.4.0'

Expand Down Expand Up @@ -111,6 +108,7 @@ gem 'httparty', '~> 0.22.0'
gem 'slack-notifier', '~> 2.4.0'

# css styles for emails
gem 'css_parser', '~> 1.19.1' # dependency for premailer, set to higher version for ruby 3.3 support
gem 'nokogiri', '~> 1.17.2'
gem 'premailer-rails', '~> 1.12.0'

Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ GEM
bigdecimal
rexml
crass (1.0.6)
css_parser (1.12.0)
css_parser (1.19.1)
addressable
cssbundling-rails (1.4.1)
railties (>= 6.0.0)
Expand Down Expand Up @@ -197,7 +197,7 @@ GEM
faraday (>= 1, < 3)
faraday-net_http (3.3.0)
net-http
ffi (1.17.0)
ffi (1.17.0-x86_64-linux-gnu)
flamegraph (0.9.5)
glob (0.4.0)
globalid (1.2.1)
Expand Down Expand Up @@ -582,6 +582,7 @@ DEPENDENCIES
capistrano3-delayed-job (~> 1.7.6)
capybara (~> 3.40.0)
counter_culture (~> 3.8)
css_parser (~> 1.19.1)
cssbundling-rails (~> 1.4.1)
dalli (~> 3.2.8)
datadog (~> 2.8.0)
Expand Down Expand Up @@ -609,7 +610,6 @@ DEPENDENCIES
kramdown-parser-gfm (~> 1.1.0)
letter_opener (~> 1.10.0)
listen (~> 3.9.0)
mail (~> 2.8.1)
mail_form (~> 1.10.1)
memory_profiler (~> 1.1.0)
minitest-ci (~> 3.4.0)
Expand Down Expand Up @@ -650,7 +650,7 @@ DEPENDENCIES
will_paginate (~> 4.0.1)

RUBY VERSION
ruby 3.1.2p20
ruby 3.3.6p108

BUNDLED WITH
2.3.7
2 changes: 0 additions & 2 deletions app/controllers/repositories_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'set'

class RepositoriesController < ApplicationController
before_action :set_repository, only: %i[show edit update destroy public hook reprocess admins add_admin remove_admin courses add_course remove_course]
skip_before_action :store_current_location, only: %i[public]
Expand Down
2 changes: 0 additions & 2 deletions app/policies/feedback_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'set'

class FeedbackPolicy < ApplicationPolicy
class Scope < ApplicationPolicy::Scope
def resolve
Expand Down
4 changes: 2 additions & 2 deletions test/runners/submission_runner_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class SubmissionRunnerTest < ActiveSupport::TestCase

STRIKE_ERROR = 'DE HAVENVAKBOND STAAKT!!1!'.freeze

def evaluate_with_stubbed_docker(obj = nil, **kwargs)
obj ||= docker_mock(**kwargs)
def evaluate_with_stubbed_docker(obj = nil, **)
obj ||= docker_mock(**)
Docker::Container.stubs(:create).returns(obj)
@submission.evaluate
end
Expand Down
Loading