Skip to content

Commit e9062b4

Browse files
authored
Merge pull request #1945 from denny/upgrade/rails-7.2
Upgrade to Rails 7.2
2 parents 49865b3 + 343759e commit e9062b4

File tree

33 files changed

+431
-129
lines changed

33 files changed

+431
-129
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ruby file: '.ruby-version'
1313

1414
source 'https://rubygems.org'
1515
source 'https://rubygems.org' do
16-
# Rails 7.1
17-
gem 'rails', '~> 7.1.5'
16+
# Rails 7.2
17+
gem 'rails', '~> 7.2.2.1'
1818

1919
# Load ENV from .env(.*) files
2020
gem 'dotenv-rails', require: 'dotenv/load'

Gemfile.lock

Lines changed: 82 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PATH
88
pagy (~> 8.6.3)
99
pg (>= 1.2.3, < 1.6.0)
1010
pundit
11-
rails (>= 7.1.5.1, < 7.2)
11+
rails (>= 7.2.2.1, < 8.0)
1212

1313
PATH
1414
remote: plugins/ShinyBlog
@@ -21,7 +21,7 @@ PATH
2121
pagy (~> 8.6.3)
2222
pg (>= 1.2.3, < 1.6.0)
2323
pundit
24-
rails (>= 7.1.5.1, < 7.2)
24+
rails (>= 7.2.2.1, < 8.0)
2525

2626
PATH
2727
remote: plugins/ShinyCMS
@@ -46,14 +46,16 @@ PATH
4646
image_processing (~> 1.12)
4747
mini_magick
4848
mjml-rails
49+
mutex_m
4950
nokogiri (>= 1.10.4)
51+
ostruct
5052
packwerk-extensions
5153
pagy (~> 8.6.3)
5254
persistent-dmnd
5355
pg (>= 1.2.3, < 1.6.0)
5456
pry-rails
5557
pundit
56-
rails (>= 7.1.5.1, < 7.2)
58+
rails (>= 7.2.2.1, < 8.0)
5759
rails-i18n
5860
recaptcha
5961
rss
@@ -76,7 +78,7 @@ PATH
7678
pagy (~> 8.6.3)
7779
pg (>= 1.2.3, < 1.6.0)
7880
pundit
79-
rails (>= 7.1.5.1, < 7.2)
81+
rails (>= 7.2.2.1, < 8.0)
8082

8183
PATH
8284
remote: plugins/ShinyInserts
@@ -88,7 +90,7 @@ PATH
8890
pagy (~> 8.6.3)
8991
pg (>= 1.2.3, < 1.6.0)
9092
pundit
91-
rails (>= 7.1.5.1, < 7.2)
93+
rails (>= 7.2.2.1, < 8.0)
9294

9395
PATH
9496
remote: plugins/ShinyLists
@@ -99,7 +101,7 @@ PATH
99101
pagy (~> 8.6.3)
100102
pg (>= 1.2.3, < 1.6.0)
101103
pundit
102-
rails (>= 7.1.5.1, < 7.2)
104+
rails (>= 7.2.2.1, < 8.0)
103105

104106
PATH
105107
remote: plugins/ShinyNews
@@ -112,7 +114,7 @@ PATH
112114
pagy (~> 8.6.3)
113115
pg (>= 1.2.3, < 1.6.0)
114116
pundit
115-
rails (>= 7.1.5.1, < 7.2)
117+
rails (>= 7.2.2.1, < 8.0)
116118

117119
PATH
118120
remote: plugins/ShinyNewsletters
@@ -124,7 +126,7 @@ PATH
124126
pagy (~> 8.6.3)
125127
pg (>= 1.2.3, < 1.6.0)
126128
pundit
127-
rails (>= 7.1.5.1, < 7.2)
129+
rails (>= 7.2.2.1, < 8.0)
128130

129131
PATH
130132
remote: plugins/ShinyPages
@@ -136,7 +138,7 @@ PATH
136138
pagy (~> 8.6.3)
137139
pg (>= 1.2.3, < 1.6.0)
138140
pundit
139-
rails (>= 7.1.5.1, < 7.2)
141+
rails (>= 7.2.2.1, < 8.0)
140142

141143
PATH
142144
remote: plugins/ShinyProfiles
@@ -147,14 +149,14 @@ PATH
147149
pagy (~> 8.6.3)
148150
pg (>= 1.2.3, < 1.6.0)
149151
pundit
150-
rails (>= 7.1.5.1, < 7.2)
152+
rails (>= 7.2.2.1, < 8.0)
151153

152154
PATH
153155
remote: plugins/ShinySEO
154156
specs:
155157
shiny_seo (21.06)
156-
pg (>= 0.18, < 2.0)
157-
rails (>= 7.1.5.1, < 7.2)
158+
pg (>= 1.2.3, < 1.6.0)
159+
rails (>= 7.2.2.1, < 8.0)
158160
sitemap_generator
159161

160162
PATH
@@ -170,7 +172,7 @@ PATH
170172
pg (>= 1.2.3, < 1.6.0)
171173
pg_search
172174
pundit
173-
rails (>= 7.1.5.1, < 7.2)
175+
rails (>= 7.2.2.1, < 8.0)
174176

175177
GEM
176178
remote: https://oss:TavsFP4Rxs7vhBGX0Li5ksWM53EcWLyd@gem.mutant.dev/
@@ -180,63 +182,58 @@ GEM
180182
GEM
181183
remote: https://rubygems.org/
182184
specs:
183-
actioncable (7.1.5.1)
184-
actionpack (= 7.1.5.1)
185-
activesupport (= 7.1.5.1)
185+
actioncable (7.2.2.1)
186+
actionpack (= 7.2.2.1)
187+
activesupport (= 7.2.2.1)
186188
nio4r (~> 2.0)
187189
websocket-driver (>= 0.6.1)
188190
zeitwerk (~> 2.6)
189-
actionmailbox (7.1.5.1)
190-
actionpack (= 7.1.5.1)
191-
activejob (= 7.1.5.1)
192-
activerecord (= 7.1.5.1)
193-
activestorage (= 7.1.5.1)
194-
activesupport (= 7.1.5.1)
195-
mail (>= 2.7.1)
196-
net-imap
197-
net-pop
198-
net-smtp
199-
actionmailer (7.1.5.1)
200-
actionpack (= 7.1.5.1)
201-
actionview (= 7.1.5.1)
202-
activejob (= 7.1.5.1)
203-
activesupport (= 7.1.5.1)
204-
mail (~> 2.5, >= 2.5.4)
205-
net-imap
206-
net-pop
207-
net-smtp
191+
actionmailbox (7.2.2.1)
192+
actionpack (= 7.2.2.1)
193+
activejob (= 7.2.2.1)
194+
activerecord (= 7.2.2.1)
195+
activestorage (= 7.2.2.1)
196+
activesupport (= 7.2.2.1)
197+
mail (>= 2.8.0)
198+
actionmailer (7.2.2.1)
199+
actionpack (= 7.2.2.1)
200+
actionview (= 7.2.2.1)
201+
activejob (= 7.2.2.1)
202+
activesupport (= 7.2.2.1)
203+
mail (>= 2.8.0)
208204
rails-dom-testing (~> 2.2)
209-
actionpack (7.1.5.1)
210-
actionview (= 7.1.5.1)
211-
activesupport (= 7.1.5.1)
205+
actionpack (7.2.2.1)
206+
actionview (= 7.2.2.1)
207+
activesupport (= 7.2.2.1)
212208
nokogiri (>= 1.8.5)
213209
racc
214-
rack (>= 2.2.4)
210+
rack (>= 2.2.4, < 3.2)
215211
rack-session (>= 1.0.1)
216212
rack-test (>= 0.6.3)
217213
rails-dom-testing (~> 2.2)
218214
rails-html-sanitizer (~> 1.6)
219-
actiontext (7.1.5.1)
220-
actionpack (= 7.1.5.1)
221-
activerecord (= 7.1.5.1)
222-
activestorage (= 7.1.5.1)
223-
activesupport (= 7.1.5.1)
215+
useragent (~> 0.16)
216+
actiontext (7.2.2.1)
217+
actionpack (= 7.2.2.1)
218+
activerecord (= 7.2.2.1)
219+
activestorage (= 7.2.2.1)
220+
activesupport (= 7.2.2.1)
224221
globalid (>= 0.6.0)
225222
nokogiri (>= 1.8.5)
226-
actionview (7.1.5.1)
227-
activesupport (= 7.1.5.1)
223+
actionview (7.2.2.1)
224+
activesupport (= 7.2.2.1)
228225
builder (~> 3.1)
229226
erubi (~> 1.11)
230227
rails-dom-testing (~> 2.2)
231228
rails-html-sanitizer (~> 1.6)
232-
activejob (7.1.5.1)
233-
activesupport (= 7.1.5.1)
229+
activejob (7.2.2.1)
230+
activesupport (= 7.2.2.1)
234231
globalid (>= 0.3.6)
235-
activemodel (7.1.5.1)
236-
activesupport (= 7.1.5.1)
237-
activerecord (7.1.5.1)
238-
activemodel (= 7.1.5.1)
239-
activesupport (= 7.1.5.1)
232+
activemodel (7.2.2.1)
233+
activesupport (= 7.2.2.1)
234+
activerecord (7.2.2.1)
235+
activemodel (= 7.2.2.1)
236+
activesupport (= 7.2.2.1)
240237
timeout (>= 0.4.0)
241238
activerecord-session_store (2.1.0)
242239
actionpack (>= 6.1)
@@ -245,25 +242,24 @@ GEM
245242
multi_json (~> 1.11, >= 1.11.2)
246243
rack (>= 2.0.8, < 4)
247244
railties (>= 6.1)
248-
activestorage (7.1.5.1)
249-
actionpack (= 7.1.5.1)
250-
activejob (= 7.1.5.1)
251-
activerecord (= 7.1.5.1)
252-
activesupport (= 7.1.5.1)
245+
activestorage (7.2.2.1)
246+
actionpack (= 7.2.2.1)
247+
activejob (= 7.2.2.1)
248+
activerecord (= 7.2.2.1)
249+
activesupport (= 7.2.2.1)
253250
marcel (~> 1.0)
254-
activesupport (7.1.5.1)
251+
activesupport (7.2.2.1)
255252
base64
256253
benchmark (>= 0.3)
257254
bigdecimal
258-
concurrent-ruby (~> 1.0, >= 1.0.2)
255+
concurrent-ruby (~> 1.0, >= 1.3.1)
259256
connection_pool (>= 2.2.5)
260257
drb
261258
i18n (>= 1.6, < 2)
262259
logger (>= 1.4.2)
263260
minitest (>= 5.1)
264-
mutex_m
265261
securerandom (>= 0.3)
266-
tzinfo (~> 2.0)
262+
tzinfo (~> 2.0, >= 2.0.5)
267263
acts-as-taggable-on (11.0.0)
268264
activerecord (>= 7.0, < 8.0)
269265
zeitwerk (>= 2.4, < 3.0)
@@ -299,7 +295,7 @@ GEM
299295
amazing_print (1.7.2)
300296
ast (2.4.2)
301297
aws-eventstream (1.3.1)
302-
aws-partitions (1.1052.0)
298+
aws-partitions (1.1059.0)
303299
aws-sdk-core (3.219.0)
304300
aws-eventstream (~> 1, >= 1.3.0)
305301
aws-partitions (~> 1, >= 1.992.0)
@@ -480,7 +476,7 @@ GEM
480476
image_processing (1.14.0)
481477
mini_magick (>= 4.9.5, < 6)
482478
ruby-vips (>= 2.0.17, < 3)
483-
immutable-ruby (0.1.0)
479+
immutable-ruby (0.2.0)
484480
concurrent-ruby (~> 1.1)
485481
sorted_set (~> 1.0)
486482
iniparse (1.5.0)
@@ -551,6 +547,7 @@ GEM
551547
racc (~> 1.4)
552548
numerizer (0.1.1)
553549
orm_adapter (0.5.0)
550+
ostruct (0.6.1)
554551
overcommit (0.67.0)
555552
childprocess (>= 0.6.3, < 6)
556553
iniparse (~> 1.4)
@@ -589,7 +586,7 @@ GEM
589586
prettyprint
590587
prettyprint (0.2.0)
591588
prism (1.2.0)
592-
pry (0.14.2)
589+
pry (0.15.2)
593590
coderay (~> 1.1)
594591
method_source (~> 1.0)
595592
pry-rails (0.3.11)
@@ -612,20 +609,20 @@ GEM
612609
rack (>= 1.3)
613610
rackup (2.2.1)
614611
rack (>= 3)
615-
rails (7.1.5.1)
616-
actioncable (= 7.1.5.1)
617-
actionmailbox (= 7.1.5.1)
618-
actionmailer (= 7.1.5.1)
619-
actionpack (= 7.1.5.1)
620-
actiontext (= 7.1.5.1)
621-
actionview (= 7.1.5.1)
622-
activejob (= 7.1.5.1)
623-
activemodel (= 7.1.5.1)
624-
activerecord (= 7.1.5.1)
625-
activestorage (= 7.1.5.1)
626-
activesupport (= 7.1.5.1)
612+
rails (7.2.2.1)
613+
actioncable (= 7.2.2.1)
614+
actionmailbox (= 7.2.2.1)
615+
actionmailer (= 7.2.2.1)
616+
actionpack (= 7.2.2.1)
617+
actiontext (= 7.2.2.1)
618+
actionview (= 7.2.2.1)
619+
activejob (= 7.2.2.1)
620+
activemodel (= 7.2.2.1)
621+
activerecord (= 7.2.2.1)
622+
activestorage (= 7.2.2.1)
623+
activesupport (= 7.2.2.1)
627624
bundler (>= 1.15.0)
628-
railties (= 7.1.5.1)
625+
railties (= 7.2.2.1)
629626
rails-dom-testing (2.2.0)
630627
activesupport (>= 5.0.0)
631628
minitest
@@ -644,10 +641,10 @@ GEM
644641
request_store
645642
sassc-rails (>= 2.0.0)
646643
turbolinks
647-
railties (7.1.5.1)
648-
actionpack (= 7.1.5.1)
649-
activesupport (= 7.1.5.1)
650-
irb
644+
railties (7.2.2.1)
645+
actionpack (= 7.2.2.1)
646+
activesupport (= 7.2.2.1)
647+
irb (~> 1.13)
651648
rackup (>= 1.0.0)
652649
rake (>= 12.2)
653650
thor (~> 1.0, >= 1.2.2)
@@ -787,7 +784,7 @@ GEM
787784
sentry-ruby (5.22.4)
788785
bigdecimal
789786
concurrent-ruby (~> 1.0, >= 1.0.2)
790-
set (1.1.0)
787+
set (1.1.1)
791788
sexp_processor (4.17.0)
792789
sidekiq (7.3.9)
793790
base64
@@ -839,6 +836,7 @@ GEM
839836
unparser (0.6.15)
840837
diff-lcs (~> 1.3)
841838
parser (>= 3.3.0)
839+
useragent (0.16.11)
842840
view_component (3.21.0)
843841
activesupport (>= 5.2.0, < 8.1)
844842
concurrent-ruby (~> 1.0)
@@ -893,7 +891,7 @@ DEPENDENCIES
893891
pg (~> 1.5.9)!
894892
puma (~> 6.6)!
895893
rack!
896-
rails (~> 7.1.5)!
894+
rails (~> 7.2.2.1)!
897895
rails-pg-extras!
898896
rails_email_preview!
899897
rspec-instafail!

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ShinyCMS is primarily intended for use by professional web developers, as a plat
66

77
Web developers can also add custom functionality by writing their own plugins. A number of helpers and concerns are provided to help you build new features quickly, and with a consistent look-and-feel to the rest of the system.
88

9-
The current version of ShinyCMS runs on Ruby 3.2 and Rails 7.1
9+
The current version of ShinyCMS runs on Ruby 3.4 and Rails 7.2
1010

1111
## Features
1212

@@ -100,7 +100,7 @@ All other supported [external services](docs/Services.md) are optional. If you a
100100

101101
### Ruby and Rails versions
102102

103-
ShinyCMS requires Ruby 3.2 and Rails 7.1 or later. The project generally uses the most recent stable release of both Ruby and Rails (currently Ruby 3.2.7 and Rails 7.1.5.1).
103+
ShinyCMS requires Ruby 3.4 and Rails 7.2 or later. The project generally uses the most recent stable release of both Ruby and Rails (currently Ruby 3.4.2 and Rails 7.2.2.1).
104104

105105

106106
## Contributing

app/models/application_record.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@
66
#
77
# ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)
88

9-
class ApplicationRecord < ActiveRecord::Base; end
9+
# Base class for models
10+
class ApplicationRecord < ActiveRecord::Base
11+
self.abstract_class = true
12+
end

0 commit comments

Comments
 (0)