Skip to content

Commit 3e47edc

Browse files
committed
Upgrade to Rails 7.2
1 parent 00ae805 commit 3e47edc

File tree

6 files changed

+103
-80
lines changed

6 files changed

+103
-80
lines changed

.github/workflows/ruby.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ jobs:
2424
run: rails db:migrate RAILS_ENV=test
2525
- name: Run tests
2626
run: bundle exec rake
27-
27+
- name: Rubocop
28+
run: rubocop -f github

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5-
gem 'rails', '~> 7.1.5.1'
5+
gem 'rails', '~> 7.2'
66
# Use sqlite3 as the database for Active Record
77
gem 'sqlite3', '>= 2.1'
88
gem 'mysql2', '~> 0.5'

Gemfile.lock

Lines changed: 97 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,77 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
Ascii85 (2.0.1)
5-
actioncable (7.1.5.1)
6-
actionpack (= 7.1.5.1)
7-
activesupport (= 7.1.5.1)
5+
actioncable (7.2.2.1)
6+
actionpack (= 7.2.2.1)
7+
activesupport (= 7.2.2.1)
88
nio4r (~> 2.0)
99
websocket-driver (>= 0.6.1)
1010
zeitwerk (~> 2.6)
11-
actionmailbox (7.1.5.1)
12-
actionpack (= 7.1.5.1)
13-
activejob (= 7.1.5.1)
14-
activerecord (= 7.1.5.1)
15-
activestorage (= 7.1.5.1)
16-
activesupport (= 7.1.5.1)
17-
mail (>= 2.7.1)
18-
net-imap
19-
net-pop
20-
net-smtp
21-
actionmailer (7.1.5.1)
22-
actionpack (= 7.1.5.1)
23-
actionview (= 7.1.5.1)
24-
activejob (= 7.1.5.1)
25-
activesupport (= 7.1.5.1)
26-
mail (~> 2.5, >= 2.5.4)
27-
net-imap
28-
net-pop
29-
net-smtp
11+
actionmailbox (7.2.2.1)
12+
actionpack (= 7.2.2.1)
13+
activejob (= 7.2.2.1)
14+
activerecord (= 7.2.2.1)
15+
activestorage (= 7.2.2.1)
16+
activesupport (= 7.2.2.1)
17+
mail (>= 2.8.0)
18+
actionmailer (7.2.2.1)
19+
actionpack (= 7.2.2.1)
20+
actionview (= 7.2.2.1)
21+
activejob (= 7.2.2.1)
22+
activesupport (= 7.2.2.1)
23+
mail (>= 2.8.0)
3024
rails-dom-testing (~> 2.2)
31-
actionpack (7.1.5.1)
32-
actionview (= 7.1.5.1)
33-
activesupport (= 7.1.5.1)
25+
actionpack (7.2.2.1)
26+
actionview (= 7.2.2.1)
27+
activesupport (= 7.2.2.1)
3428
nokogiri (>= 1.8.5)
3529
racc
36-
rack (>= 2.2.4)
30+
rack (>= 2.2.4, < 3.2)
3731
rack-session (>= 1.0.1)
3832
rack-test (>= 0.6.3)
3933
rails-dom-testing (~> 2.2)
4034
rails-html-sanitizer (~> 1.6)
41-
actiontext (7.1.5.1)
42-
actionpack (= 7.1.5.1)
43-
activerecord (= 7.1.5.1)
44-
activestorage (= 7.1.5.1)
45-
activesupport (= 7.1.5.1)
35+
useragent (~> 0.16)
36+
actiontext (7.2.2.1)
37+
actionpack (= 7.2.2.1)
38+
activerecord (= 7.2.2.1)
39+
activestorage (= 7.2.2.1)
40+
activesupport (= 7.2.2.1)
4641
globalid (>= 0.6.0)
4742
nokogiri (>= 1.8.5)
48-
actionview (7.1.5.1)
49-
activesupport (= 7.1.5.1)
43+
actionview (7.2.2.1)
44+
activesupport (= 7.2.2.1)
5045
builder (~> 3.1)
5146
erubi (~> 1.11)
5247
rails-dom-testing (~> 2.2)
5348
rails-html-sanitizer (~> 1.6)
54-
activejob (7.1.5.1)
55-
activesupport (= 7.1.5.1)
49+
activejob (7.2.2.1)
50+
activesupport (= 7.2.2.1)
5651
globalid (>= 0.3.6)
57-
activemodel (7.1.5.1)
58-
activesupport (= 7.1.5.1)
59-
activerecord (7.1.5.1)
60-
activemodel (= 7.1.5.1)
61-
activesupport (= 7.1.5.1)
52+
activemodel (7.2.2.1)
53+
activesupport (= 7.2.2.1)
54+
activerecord (7.2.2.1)
55+
activemodel (= 7.2.2.1)
56+
activesupport (= 7.2.2.1)
6257
timeout (>= 0.4.0)
63-
activestorage (7.1.5.1)
64-
actionpack (= 7.1.5.1)
65-
activejob (= 7.1.5.1)
66-
activerecord (= 7.1.5.1)
67-
activesupport (= 7.1.5.1)
58+
activestorage (7.2.2.1)
59+
actionpack (= 7.2.2.1)
60+
activejob (= 7.2.2.1)
61+
activerecord (= 7.2.2.1)
62+
activesupport (= 7.2.2.1)
6863
marcel (~> 1.0)
69-
activesupport (7.1.5.1)
64+
activesupport (7.2.2.1)
7065
base64
7166
benchmark (>= 0.3)
7267
bigdecimal
73-
concurrent-ruby (~> 1.0, >= 1.0.2)
68+
concurrent-ruby (~> 1.0, >= 1.3.1)
7469
connection_pool (>= 2.2.5)
7570
drb
7671
i18n (>= 1.6, < 2)
7772
logger (>= 1.4.2)
7873
minitest (>= 5.1)
79-
mutex_m
8074
securerandom (>= 0.3)
81-
tzinfo (~> 2.0)
75+
tzinfo (~> 2.0, >= 2.0.5)
8276
afm (0.2.2)
8377
base64 (0.2.0)
8478
bcrypt (3.1.20)
@@ -100,8 +94,14 @@ GEM
10094
drb (2.2.1)
10195
erubi (1.13.1)
10296
execjs (2.10.0)
103-
ffi (1.17.1)
97+
ffi (1.17.1-aarch64-linux-gnu)
98+
ffi (1.17.1-aarch64-linux-musl)
99+
ffi (1.17.1-arm-linux-gnu)
100+
ffi (1.17.1-arm-linux-musl)
101+
ffi (1.17.1-arm64-darwin)
102+
ffi (1.17.1-x86_64-darwin)
104103
ffi (1.17.1-x86_64-linux-gnu)
104+
ffi (1.17.1-x86_64-linux-musl)
105105
globalid (1.2.1)
106106
activesupport (>= 6.1)
107107
hashery (2.1.2)
@@ -133,9 +133,7 @@ GEM
133133
net-smtp
134134
marcel (1.0.4)
135135
mini_mime (1.1.5)
136-
mini_portile2 (2.8.8)
137136
minitest (5.25.4)
138-
mutex_m (0.3.0)
139137
mysql2 (0.5.6)
140138
net-imap (0.5.6)
141139
date
@@ -147,11 +145,22 @@ GEM
147145
net-smtp (0.5.1)
148146
net-protocol
149147
nio4r (2.7.4)
150-
nokogiri (1.18.3)
151-
mini_portile2 (~> 2.8.2)
148+
nokogiri (1.18.3-aarch64-linux-gnu)
149+
racc (~> 1.4)
150+
nokogiri (1.18.3-aarch64-linux-musl)
151+
racc (~> 1.4)
152+
nokogiri (1.18.3-arm-linux-gnu)
153+
racc (~> 1.4)
154+
nokogiri (1.18.3-arm-linux-musl)
155+
racc (~> 1.4)
156+
nokogiri (1.18.3-arm64-darwin)
157+
racc (~> 1.4)
158+
nokogiri (1.18.3-x86_64-darwin)
152159
racc (~> 1.4)
153160
nokogiri (1.18.3-x86_64-linux-gnu)
154161
racc (~> 1.4)
162+
nokogiri (1.18.3-x86_64-linux-musl)
163+
racc (~> 1.4)
155164
ostruct (0.6.1)
156165
pdf-reader (2.14.1)
157166
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
@@ -176,31 +185,31 @@ GEM
176185
rack (>= 1.3)
177186
rackup (2.2.1)
178187
rack (>= 3)
179-
rails (7.1.5.1)
180-
actioncable (= 7.1.5.1)
181-
actionmailbox (= 7.1.5.1)
182-
actionmailer (= 7.1.5.1)
183-
actionpack (= 7.1.5.1)
184-
actiontext (= 7.1.5.1)
185-
actionview (= 7.1.5.1)
186-
activejob (= 7.1.5.1)
187-
activemodel (= 7.1.5.1)
188-
activerecord (= 7.1.5.1)
189-
activestorage (= 7.1.5.1)
190-
activesupport (= 7.1.5.1)
188+
rails (7.2.2.1)
189+
actioncable (= 7.2.2.1)
190+
actionmailbox (= 7.2.2.1)
191+
actionmailer (= 7.2.2.1)
192+
actionpack (= 7.2.2.1)
193+
actiontext (= 7.2.2.1)
194+
actionview (= 7.2.2.1)
195+
activejob (= 7.2.2.1)
196+
activemodel (= 7.2.2.1)
197+
activerecord (= 7.2.2.1)
198+
activestorage (= 7.2.2.1)
199+
activesupport (= 7.2.2.1)
191200
bundler (>= 1.15.0)
192-
railties (= 7.1.5.1)
201+
railties (= 7.2.2.1)
193202
rails-dom-testing (2.2.0)
194203
activesupport (>= 5.0.0)
195204
minitest
196205
nokogiri (>= 1.6)
197206
rails-html-sanitizer (1.6.2)
198207
loofah (~> 2.21)
199208
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
200-
railties (7.1.5.1)
201-
actionpack (= 7.1.5.1)
202-
activesupport (= 7.1.5.1)
203-
irb
209+
railties (7.2.2.1)
210+
actionpack (= 7.2.2.1)
211+
activesupport (= 7.2.2.1)
212+
irb (~> 1.13)
204213
rackup (>= 1.0.0)
205214
rake (>= 12.2)
206215
thor (~> 1.0, >= 1.2.2)
@@ -230,9 +239,14 @@ GEM
230239
actionpack (>= 6.1)
231240
activesupport (>= 6.1)
232241
sprockets (>= 3.0.0)
233-
sqlite3 (2.6.0)
234-
mini_portile2 (~> 2.8.0)
242+
sqlite3 (2.6.0-aarch64-linux-gnu)
243+
sqlite3 (2.6.0-aarch64-linux-musl)
244+
sqlite3 (2.6.0-arm-linux-gnu)
245+
sqlite3 (2.6.0-arm-linux-musl)
246+
sqlite3 (2.6.0-arm64-darwin)
247+
sqlite3 (2.6.0-x86_64-darwin)
235248
sqlite3 (2.6.0-x86_64-linux-gnu)
249+
sqlite3 (2.6.0-x86_64-linux-musl)
236250
stringio (3.1.5)
237251
thor (1.3.2)
238252
tilt (2.6.0)
@@ -246,6 +260,7 @@ GEM
246260
concurrent-ruby (~> 1.0)
247261
uglifier (4.2.1)
248262
execjs (>= 0.3.0, < 3)
263+
useragent (0.16.11)
249264
web-console (2.3.0)
250265
activemodel (>= 4.0)
251266
binding_of_caller (>= 0.7.2)
@@ -259,8 +274,14 @@ GEM
259274
zeitwerk (2.7.2)
260275

261276
PLATFORMS
262-
ruby
263-
x86_64-linux
277+
aarch64-linux-gnu
278+
aarch64-linux-musl
279+
arm-linux-gnu
280+
arm-linux-musl
281+
arm64-darwin
282+
x86_64-darwin
283+
x86_64-linux-gnu
284+
x86_64-linux-musl
264285

265286
DEPENDENCIES
266287
bcrypt (~> 3.1.7)
@@ -273,7 +294,7 @@ DEPENDENCIES
273294
mysql2 (~> 0.5)
274295
pdf-reader
275296
rack-cors
276-
rails (~> 7.1.5.1)
297+
rails (~> 7.2)
277298
sassc-rails
278299
sdoc (~> 1.1.0)
279300
spring

app/controllers/version_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class VersionController < ApplicationController
33

44
# GET /version
55
def version
6-
version = '1.5.12'
6+
version = '1.5.14'
77
json_response(version: version)
88
end
99
end

app/lib/json_web_token.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class JsonWebToken
22
# secret to encode and decode token
3-
HMAC_SECRET = Rails.application.secrets.secret_key_base
3+
HMAC_SECRET = Rails.configuration.secrets.secret_key_base
44

55
def self.encode(payload, exp = 24.hours.from_now)
66
# set expiry to 24 hours from creation time

config/application.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ class Application < Rails::Application
2525

2626
# Deprecated since Rails version 6
2727
# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
28+
config.secrets = config_for(:secrets)
2829
end
2930
end

0 commit comments

Comments
 (0)