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

Bump rails from 7.0.8 to 7.1.0 #5031

Merged
merged 19 commits into from
Oct 11, 2023
+205 −133
Merged

Bump rails from 7.0.8 to 7.1.0 #5031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6bda1d2
Bump ddtrace from 1.14.0 to 1.15.0
dependabot[bot] Oct 9, 2023
2e9d76a
Bump rails from 7.0.8 to 7.1.0
dependabot[bot] Oct 9, 2023
2d62e52
Remove incorrect use of popularity enum
jorg-vr Oct 9, 2023
b048a89
Assert redirect when expecting a redirect
jorg-vr Oct 9, 2023
1bc812b
Merge pull request #5030 from dodona-edu/dependabot/bundler/ddtrace-1…
bmesuere Oct 9, 2023
b55e689
Fix i18n key path
jorg-vr Oct 9, 2023
01bd79f
add slack invite link
bmesuere Oct 9, 2023
57082b7
Merge pull request #5032 from dodona-edu/chore/support-chat
bmesuere Oct 9, 2023
0a838ac
Merge branch 'dependabot/bundler/rails-7.1.0' of github.com:dodona-ed…
jorg-vr Oct 9, 2023
927e283
Run 'bin/rails app:update'
jorg-vr Oct 9, 2023
f67a960
Revert "Run 'bin/rails app:update'"
jorg-vr Oct 9, 2023
58650a9
Run 'bin/rails app:update'
jorg-vr Oct 10, 2023
c825271
Ignore missing callbacks and throw errors in tests
jorg-vr Oct 10, 2023
37de3c1
Apply new defaults
jorg-vr Oct 10, 2023
41635ce
Remove new deaults file
jorg-vr Oct 10, 2023
a1a6948
Do not eager load tests
jorg-vr Oct 10, 2023
3aca6b6
Use viewBox to support HTML5
jorg-vr Oct 11, 2023
9f2d546
Move to new to_time default
jorg-vr Oct 11, 2023
c7cb3ff
Update rails js packages
jorg-vr Oct 11, 2023
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 @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '~> 3.1.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0.8'
gem 'rails', '~> 7.1.0'
# Use mysql as the database for Active Record
gem 'mysql2', '~> 0.5.5'
# Use Puma as the app server
Expand Down Expand Up @@ -135,7 +135,7 @@ gem 'memory_profiler', '~> 1.0.1'
gem 'rack-mini-profiler', '~> 3.1.1'
gem 'stackprof', '~> 0.2.25'

gem 'ddtrace', '~> 1.14.0'
gem 'ddtrace', '~> 1.15.0'

# Make sure filesystem changes only happen at the end of a transaction
gem 'after_commit_everywhere', '~> 1.3.1'
Expand Down
189 changes: 111 additions & 78 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,70 +2,78 @@ GEM
remote: https://rubygems.org/
specs:
ace-rails-ap (4.5)
actioncable (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
actioncable (7.1.0)
actionpack (= 7.1.0)
activesupport (= 7.1.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
zeitwerk (~> 2.6)
actionmailbox (7.1.0)
actionpack (= 7.1.0)
activejob (= 7.1.0)
activerecord (= 7.1.0)
activestorage (= 7.1.0)
activesupport (= 7.1.0)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8)
actionpack (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activesupport (= 7.0.8)
actionmailer (7.1.0)
actionpack (= 7.1.0)
actionview (= 7.1.0)
activejob (= 7.1.0)
activesupport (= 7.1.0)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8)
actionview (= 7.0.8)
activesupport (= 7.0.8)
rack (~> 2.0, >= 2.2.4)
rails-dom-testing (~> 2.2)
actionpack (7.1.0)
actionview (= 7.1.0)
activesupport (= 7.1.0)
nokogiri (>= 1.8.5)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8)
actionpack (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.0)
actionpack (= 7.1.0)
activerecord (= 7.1.0)
activestorage (= 7.1.0)
activesupport (= 7.1.0)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8)
activesupport (= 7.0.8)
actionview (7.1.0)
activesupport (= 7.1.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8)
activesupport (= 7.0.8)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.0)
activesupport (= 7.1.0)
globalid (>= 0.3.6)
activemodel (7.0.8)
activesupport (= 7.0.8)
activerecord (7.0.8)
activemodel (= 7.0.8)
activesupport (= 7.0.8)
activestorage (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activesupport (= 7.0.8)
activemodel (7.1.0)
activesupport (= 7.1.0)
activerecord (7.1.0)
activemodel (= 7.1.0)
activesupport (= 7.1.0)
timeout (>= 0.4.0)
activestorage (7.1.0)
actionpack (= 7.1.0)
activejob (= 7.1.0)
activerecord (= 7.1.0)
activesupport (= 7.1.0)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8)
activesupport (7.1.0)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
Expand All @@ -85,6 +93,7 @@ GEM
base64 (0.1.1)
bcrypt (3.1.18)
bcrypt_pbkdf (1.1.0)
bigdecimal (3.1.4)
bindata (2.4.15)
bindex (0.8.1)
bootsnap (1.16.0)
Expand Down Expand Up @@ -121,6 +130,7 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
counter_culture (3.5.0)
activerecord (>= 4.2)
activesupport (>= 4.2)
Expand All @@ -133,13 +143,16 @@ GEM
railties (>= 6.0.0)
daemons (1.4.1)
dalli (3.2.6)
datadog-ci (0.2.0)
msgpack
date (3.3.3)
ddtrace (1.14.0)
debase-ruby_core_source (= 3.2.1)
libdatadog (~> 3.0.0.1.0)
libddwaf (~> 1.9.0.0.0)
ddtrace (1.15.0)
datadog-ci (~> 0.2.0)
debase-ruby_core_source (= 3.2.2)
libdatadog (~> 5.0.0.1.0)
libddwaf (~> 1.14.0.0.0)
msgpack
debase-ruby_core_source (3.2.1)
debase-ruby_core_source (3.2.2)
delayed_job (4.1.10)
activesupport (>= 3.0, < 8.0)
delayed_job_active_record (4.1.7)
Expand All @@ -161,6 +174,8 @@ GEM
docker-api (2.2.0)
excon (>= 0.47.0)
multi_json
drb (2.1.1)
ruby2_keywords
ed25519 (1.3.0)
erubi (1.12.0)
exception_notification (4.5.0)
Expand All @@ -181,7 +196,7 @@ GEM
faraday-follow_redirects (0.3.0)
faraday (>= 1, < 3)
faraday-net_http (3.0.2)
ffi (1.15.5)
ffi (1.16.3)
flamegraph (0.9.5)
glob (0.4.0)
globalid (1.2.1)
Expand Down Expand Up @@ -209,6 +224,10 @@ GEM
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
io-console (0.6.0)
irb (1.8.1)
rdoc
reline (>= 0.3.8)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
Expand All @@ -235,8 +254,8 @@ GEM
addressable (~> 2.7)
letter_opener (1.8.1)
launchy (>= 2.2, < 3)
libdatadog (3.0.0.1.0-x86_64-linux)
libddwaf (1.9.0.0.1-x86_64-linux)
libdatadog (5.0.0.1.0-x86_64-linux)
libddwaf (1.14.0.0.0-x86_64-linux)
ffi (~> 1.0)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
Expand All @@ -255,7 +274,6 @@ GEM
marcel (1.0.2)
matrix (0.4.2)
memory_profiler (1.0.1)
method_source (1.0.0)
mini_magick (4.11.0)
mini_mime (1.1.5)
minitest (5.20.0)
Expand All @@ -270,8 +288,9 @@ GEM
multi_xml (0.6.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
mutex_m (0.1.2)
mysql2 (0.5.5)
net-imap (0.3.7)
net-imap (0.4.0)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -280,7 +299,7 @@ GEM
timeout
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.3.3)
net-smtp (0.4.0)
net-protocol
net-ssh (7.1.0)
nio4r (2.5.9)
Expand Down Expand Up @@ -339,6 +358,8 @@ GEM
premailer (~> 1.7, >= 1.7.9)
pretender (0.5.0)
actionpack (>= 6.1)
psych (5.1.0)
stringio
public_suffix (5.0.3)
puma (6.4.0)
nio4r (~> 2.0)
Expand All @@ -357,22 +378,27 @@ GEM
rack (>= 2.1.0)
rack-protection (3.0.4)
rack
rack-session (1.0.1)
rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8)
actioncable (= 7.0.8)
actionmailbox (= 7.0.8)
actionmailer (= 7.0.8)
actionpack (= 7.0.8)
actiontext (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activemodel (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.0)
actioncable (= 7.1.0)
actionmailbox (= 7.1.0)
actionmailer (= 7.1.0)
actionpack (= 7.1.0)
actiontext (= 7.1.0)
actionview (= 7.1.0)
activejob (= 7.1.0)
activemodel (= 7.1.0)
activerecord (= 7.1.0)
activestorage (= 7.1.0)
activesupport (= 7.1.0)
bundler (>= 1.15.0)
railties (= 7.0.8)
railties (= 7.1.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -387,20 +413,25 @@ GEM
rails-i18n (7.0.8)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
method_source
railties (7.1.0)
actionpack (= 7.1.0)
activesupport (= 7.1.0)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rb-readline (0.5.5)
rdoc (6.5.0)
psych (>= 4.0.0)
regexp_parser (2.8.1)
reline (0.3.9)
io-console (~> 0.5)
responders (3.1.0)
actionpack (>= 5.2)
railties (>= 5.2)
Expand Down Expand Up @@ -473,6 +504,7 @@ GEM
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stackprof (0.2.25)
stringio (3.0.8)
swd (2.0.2)
activesupport (>= 3)
attr_required (>= 0.0.5)
Expand Down Expand Up @@ -512,14 +544,15 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
websocket (1.2.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
will_paginate (4.0.0)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.11)
zeitwerk (2.6.12)

PLATFORMS
x86_64-linux
Expand All @@ -542,7 +575,7 @@ DEPENDENCIES
counter_culture (~> 3.5)
cssbundling-rails (~> 1.3.3)
dalli (~> 3.2.6)
ddtrace (~> 1.14.0)
ddtrace (~> 1.15.0)
delayed_job_active_record (~> 4.1.7)
delayed_job_web (~> 1.4.4)
devise (~> 4.9.2)
Expand Down Expand Up @@ -584,7 +617,7 @@ DEPENDENCIES
puma (~> 6.4.0)
pundit (~> 2.3.1)
rack-mini-profiler (~> 3.1.1)
rails (~> 7.0.8)
rails (~> 7.1.0)
rails-controller-testing (~> 1.0.5)
rails-i18n (~> 7.0.8)
rb-readline (~> 0.5.5)
Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
![GitHub release (latest by date)](https://img.shields.io/github/v/release/dodona-edu/dodona)
![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/dodona-edu/dodona/test.yml?branch=main)
![Codecov](https://img.shields.io/codecov/c/github/dodona-edu/dodona)
[![Support chat](https://img.shields.io/static/v1?label=support%20chat&message=on%20matrix&color=informational)](https://matrix.to/#/#dodona-support:vanpetegem.me?via=vanpetegem.me)
[![General chat](https://img.shields.io/static/v1?label=general%20chat&message=on%20matrix&color=informational)](https://matrix.to/#/#dodona-general:vanpetegem.me?via=vanpetegem.me&via=matrix.org&via=beardhatcode.be)
[![Support chat](https://img.shields.io/static/v1?label=support%20chat&message=on%20slack&color=informational)](https://join.slack.com/t/dodona-edu/shared_invite/zt-24o2an3bp-fFR_TTM0fB_kmlCvkS2ckA)

> Dodona is an online exercise platform for **learning to code**. It wants to teach students how to program in the most meaningful and effective way possible. Dodona acts as an **online co-teacher**, designed to give every student access to high quality education. The focus is on automatic corrections and giving **meaningful feedback** on the submitted solutions from students.

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/api_tokens_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
f.js { render 'create', locals: { toast: message, new_token: @token } }
else
errors = @token.errors.full_messages
errors << I18n.t('errors.models.api_token.attributes.not_permitted') unless can_create
errors << I18n.t('activerecord.errors.models.api_token.not_permitted') unless can_create

Check warning on line 21 in app/controllers/api_tokens_controller.rb

View check run for this annotation

Codecov / codecov/patch

app/controllers/api_tokens_controller.rb#L21 

Added line #L21 was not covered by tests
message = errors.join(', ')
f.html do
redirect_back fallback_location: root_path,
Expand Down
Loading