Skip to content

Commit 4f58b29

Browse files
authored
Merge pull request #1952 from denny/upgrade/rails-8.0
Upgrade to Rails 8.0
2 parents 6869fa0 + eb6b33a commit 4f58b29

File tree

27 files changed

+267
-143
lines changed

27 files changed

+267
-143
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.2
17-
gem 'rails', '~> 7.2.2.1'
16+
# Rails 8.0
17+
gem 'rails', '~> 8.0.2'
1818

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

Gemfile.lock

Lines changed: 73 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PATH
88
pagy (~> 9.3.4)
99
pg (>= 1.2.3, < 1.6.0)
1010
pundit
11-
rails (>= 7.2.2.1, < 8.0)
11+
rails (>= 8.0.2, < 8.1)
1212

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

2626
PATH
2727
remote: plugins/ShinyCMS
@@ -55,7 +55,7 @@ PATH
5555
pg (>= 1.2.3, < 1.6.0)
5656
pry-rails
5757
pundit
58-
rails (>= 7.2.2.1, < 8.0)
58+
rails (>= 8.0.2, < 8.1)
5959
rails-i18n
6060
recaptcha
6161
rss
@@ -78,7 +78,7 @@ PATH
7878
pagy (~> 9.3.4)
7979
pg (>= 1.2.3, < 1.6.0)
8080
pundit
81-
rails (>= 7.2.2.1, < 8.0)
81+
rails (>= 8.0.2, < 8.1)
8282

8383
PATH
8484
remote: plugins/ShinyInserts
@@ -90,7 +90,7 @@ PATH
9090
pagy (~> 9.3.4)
9191
pg (>= 1.2.3, < 1.6.0)
9292
pundit
93-
rails (>= 7.2.2.1, < 8.0)
93+
rails (>= 8.0.2, < 8.1)
9494

9595
PATH
9696
remote: plugins/ShinyLists
@@ -101,7 +101,7 @@ PATH
101101
pagy (~> 9.3.4)
102102
pg (>= 1.2.3, < 1.6.0)
103103
pundit
104-
rails (>= 7.2.2.1, < 8.0)
104+
rails (>= 8.0.2, < 8.1)
105105

106106
PATH
107107
remote: plugins/ShinyNews
@@ -114,7 +114,7 @@ PATH
114114
pagy (~> 9.3.4)
115115
pg (>= 1.2.3, < 1.6.0)
116116
pundit
117-
rails (>= 7.2.2.1, < 8.0)
117+
rails (>= 8.0.2, < 8.1)
118118

119119
PATH
120120
remote: plugins/ShinyNewsletters
@@ -126,7 +126,7 @@ PATH
126126
pagy (~> 9.3.4)
127127
pg (>= 1.2.3, < 1.6.0)
128128
pundit
129-
rails (>= 7.2.2.1, < 8.0)
129+
rails (>= 8.0.2, < 8.1)
130130

131131
PATH
132132
remote: plugins/ShinyPages
@@ -138,7 +138,7 @@ PATH
138138
pagy (~> 9.3.4)
139139
pg (>= 1.2.3, < 1.6.0)
140140
pundit
141-
rails (>= 7.2.2.1, < 8.0)
141+
rails (>= 8.0.2, < 8.1)
142142

143143
PATH
144144
remote: plugins/ShinyProfiles
@@ -149,14 +149,14 @@ PATH
149149
pagy (~> 9.3.4)
150150
pg (>= 1.2.3, < 1.6.0)
151151
pundit
152-
rails (>= 7.2.2.1, < 8.0)
152+
rails (>= 8.0.2, < 8.1)
153153

154154
PATH
155155
remote: plugins/ShinySEO
156156
specs:
157157
shiny_seo (21.06)
158158
pg (>= 1.2.3, < 1.6.0)
159-
rails (>= 7.2.2.1, < 8.0)
159+
rails (>= 8.0.2, < 8.1)
160160
sitemap_generator
161161

162162
PATH
@@ -172,63 +172,62 @@ PATH
172172
pg (>= 1.2.3, < 1.6.0)
173173
pg_search
174174
pundit
175-
rails (>= 7.2.2.1, < 8.0)
175+
rails (>= 8.0.2, < 8.1)
176176

177177
GEM
178178
remote: https://rubygems.org/
179179
specs:
180-
actioncable (7.2.2.1)
181-
actionpack (= 7.2.2.1)
182-
activesupport (= 7.2.2.1)
180+
actioncable (8.0.2)
181+
actionpack (= 8.0.2)
182+
activesupport (= 8.0.2)
183183
nio4r (~> 2.0)
184184
websocket-driver (>= 0.6.1)
185185
zeitwerk (~> 2.6)
186-
actionmailbox (7.2.2.1)
187-
actionpack (= 7.2.2.1)
188-
activejob (= 7.2.2.1)
189-
activerecord (= 7.2.2.1)
190-
activestorage (= 7.2.2.1)
191-
activesupport (= 7.2.2.1)
186+
actionmailbox (8.0.2)
187+
actionpack (= 8.0.2)
188+
activejob (= 8.0.2)
189+
activerecord (= 8.0.2)
190+
activestorage (= 8.0.2)
191+
activesupport (= 8.0.2)
192192
mail (>= 2.8.0)
193-
actionmailer (7.2.2.1)
194-
actionpack (= 7.2.2.1)
195-
actionview (= 7.2.2.1)
196-
activejob (= 7.2.2.1)
197-
activesupport (= 7.2.2.1)
193+
actionmailer (8.0.2)
194+
actionpack (= 8.0.2)
195+
actionview (= 8.0.2)
196+
activejob (= 8.0.2)
197+
activesupport (= 8.0.2)
198198
mail (>= 2.8.0)
199199
rails-dom-testing (~> 2.2)
200-
actionpack (7.2.2.1)
201-
actionview (= 7.2.2.1)
202-
activesupport (= 7.2.2.1)
200+
actionpack (8.0.2)
201+
actionview (= 8.0.2)
202+
activesupport (= 8.0.2)
203203
nokogiri (>= 1.8.5)
204-
racc
205-
rack (>= 2.2.4, < 3.2)
204+
rack (>= 2.2.4)
206205
rack-session (>= 1.0.1)
207206
rack-test (>= 0.6.3)
208207
rails-dom-testing (~> 2.2)
209208
rails-html-sanitizer (~> 1.6)
210209
useragent (~> 0.16)
211-
actiontext (7.2.2.1)
212-
actionpack (= 7.2.2.1)
213-
activerecord (= 7.2.2.1)
214-
activestorage (= 7.2.2.1)
215-
activesupport (= 7.2.2.1)
210+
actiontext (8.0.2)
211+
actionpack (= 8.0.2)
212+
activerecord (= 8.0.2)
213+
activestorage (= 8.0.2)
214+
activesupport (= 8.0.2)
216215
globalid (>= 0.6.0)
217216
nokogiri (>= 1.8.5)
218-
actionview (7.2.2.1)
219-
activesupport (= 7.2.2.1)
217+
actionview (8.0.2)
218+
activesupport (= 8.0.2)
220219
builder (~> 3.1)
221220
erubi (~> 1.11)
222221
rails-dom-testing (~> 2.2)
223222
rails-html-sanitizer (~> 1.6)
224-
activejob (7.2.2.1)
225-
activesupport (= 7.2.2.1)
223+
activejob (8.0.2)
224+
activesupport (= 8.0.2)
226225
globalid (>= 0.3.6)
227-
activemodel (7.2.2.1)
228-
activesupport (= 7.2.2.1)
229-
activerecord (7.2.2.1)
230-
activemodel (= 7.2.2.1)
231-
activesupport (= 7.2.2.1)
226+
activemodel (8.0.2)
227+
activesupport (= 8.0.2)
228+
activerecord (8.0.2)
229+
activemodel (= 8.0.2)
230+
activesupport (= 8.0.2)
232231
timeout (>= 0.4.0)
233232
activerecord-session_store (2.1.0)
234233
actionpack (>= 6.1)
@@ -237,13 +236,13 @@ GEM
237236
multi_json (~> 1.11, >= 1.11.2)
238237
rack (>= 2.0.8, < 4)
239238
railties (>= 6.1)
240-
activestorage (7.2.2.1)
241-
actionpack (= 7.2.2.1)
242-
activejob (= 7.2.2.1)
243-
activerecord (= 7.2.2.1)
244-
activesupport (= 7.2.2.1)
239+
activestorage (8.0.2)
240+
actionpack (= 8.0.2)
241+
activejob (= 8.0.2)
242+
activerecord (= 8.0.2)
243+
activesupport (= 8.0.2)
245244
marcel (~> 1.0)
246-
activesupport (7.2.2.1)
245+
activesupport (8.0.2)
247246
base64
248247
benchmark (>= 0.3)
249248
bigdecimal
@@ -255,8 +254,9 @@ GEM
255254
minitest (>= 5.1)
256255
securerandom (>= 0.3)
257256
tzinfo (~> 2.0, >= 2.0.5)
258-
acts-as-taggable-on (11.0.0)
259-
activerecord (>= 7.0, < 8.0)
257+
uri (>= 0.13.1)
258+
acts-as-taggable-on (12.0.0)
259+
activerecord (>= 7.1, < 8.1)
260260
zeitwerk (>= 2.4, < 3.0)
261261
acts_as_list (1.2.4)
262262
activerecord (>= 6.1)
@@ -606,30 +606,30 @@ GEM
606606
rack (>= 1.3)
607607
rackup (2.2.1)
608608
rack (>= 3)
609-
rails (7.2.2.1)
610-
actioncable (= 7.2.2.1)
611-
actionmailbox (= 7.2.2.1)
612-
actionmailer (= 7.2.2.1)
613-
actionpack (= 7.2.2.1)
614-
actiontext (= 7.2.2.1)
615-
actionview (= 7.2.2.1)
616-
activejob (= 7.2.2.1)
617-
activemodel (= 7.2.2.1)
618-
activerecord (= 7.2.2.1)
619-
activestorage (= 7.2.2.1)
620-
activesupport (= 7.2.2.1)
609+
rails (8.0.2)
610+
actioncable (= 8.0.2)
611+
actionmailbox (= 8.0.2)
612+
actionmailer (= 8.0.2)
613+
actionpack (= 8.0.2)
614+
actiontext (= 8.0.2)
615+
actionview (= 8.0.2)
616+
activejob (= 8.0.2)
617+
activemodel (= 8.0.2)
618+
activerecord (= 8.0.2)
619+
activestorage (= 8.0.2)
620+
activesupport (= 8.0.2)
621621
bundler (>= 1.15.0)
622-
railties (= 7.2.2.1)
622+
railties (= 8.0.2)
623623
rails-dom-testing (2.2.0)
624624
activesupport (>= 5.0.0)
625625
minitest
626626
nokogiri (>= 1.6)
627627
rails-html-sanitizer (1.6.2)
628628
loofah (~> 2.21)
629629
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)
630-
rails-i18n (7.0.10)
630+
rails-i18n (8.0.1)
631631
i18n (>= 0.7, < 2)
632-
railties (>= 6.0.0, < 8)
632+
railties (>= 8.0.0, < 9)
633633
rails-pg-extras (5.6.7)
634634
rails
635635
ruby-pg-extras (= 5.6.7)
@@ -638,9 +638,9 @@ GEM
638638
request_store
639639
sassc-rails (>= 2.0.0)
640640
turbolinks
641-
railties (7.2.2.1)
642-
actionpack (= 7.2.2.1)
643-
activesupport (= 7.2.2.1)
641+
railties (8.0.2)
642+
actionpack (= 8.0.2)
643+
activesupport (= 8.0.2)
644644
irb (~> 1.13)
645645
rackup (>= 1.0.0)
646646
rake (>= 12.2)
@@ -833,6 +833,7 @@ GEM
833833
unparser (0.6.15)
834834
diff-lcs (~> 1.3)
835835
parser (>= 3.3.0)
836+
uri (1.0.3)
836837
useragent (0.16.11)
837838
view_component (3.21.0)
838839
activesupport (>= 5.2.0, < 8.1)
@@ -887,7 +888,7 @@ DEPENDENCIES
887888
puma (~> 6.6)!
888889
rack!
889890
rack-attack!
890-
rails (~> 7.2.2.1)!
891+
rails (~> 8.0.2)!
891892
rails-pg-extras!
892893
rails_email_preview!
893894
rspec-instafail!

bin/dev

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env ruby
2+
exec "./bin/rails", "server", *ARGV

config/application.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module ShinyHostApp
3333
# Rails application class for the ShinyHostApp
3434
class Application < Rails::Application
3535
# Initialize configuration defaults for originally generated Rails version.
36-
config.load_defaults 7.2
36+
config.load_defaults 8.0
3737

3838
# Configuration for the application, engines, and railties goes here.
3939
#
@@ -43,6 +43,11 @@ class Application < Rails::Application
4343
# config.time_zone = "Central Time (US & Canada)"
4444
# config.eager_load_paths << Rails.root.join("extras")
4545

46+
# Please, add to the `ignore` list any other `lib` subdirectories that do
47+
# not contain `.rb` files, or that should not be reloaded or eager loaded.
48+
# Common ones are `templates`, `generators`, or `middleware`, for example.
49+
config.autoload_lib( ignore: %w[ assets generators tasks ] )
50+
4651
# Add autoloaded paths into `$LOAD_PATH`
4752
config.add_autoload_paths_to_load_path = true
4853

config/puma.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,7 @@
4343

4444
# Allow puma to be restarted by `rails restart` command.
4545
plugin :tmp_restart
46+
47+
# Specify the PID file. Defaults to tmp/pids/server.pid in development.
48+
# In other environments, only set the PID file if requested.
49+
pidfile ENV['PIDFILE'] if ENV['PIDFILE']

docs/Features/MainApp/admin-features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
The CMS has an admin area, imaginatively located at https://{your-domain-name}/admin
88

9-
Any CMS feature (whether built-in or a plugin) that allows you update content or change settings will make itself available to you in this admin area - either by adding its own menu section, or by adding an item to the 'Other' menu section.
9+
Any CMS feature that allows you update content or change settings should make itself available to you in this admin area - either by adding its own menu section, or by adding an item to the 'Other' menu section.
1010

11-
Plugins appear in the admin menu in the order that they are loaded; this can be specified by setting `SHINYCMS_PLUGINS` in your .env.* files or Heroku config vars (otherwise, the default behaviour is for all plugins to be loaded, in alphabetical order).
11+
Plugins appear in the admin menu in the order that they are loaded, which is specified by `SHINYCMS_PLUGINS` in your .env.* files or Heroku config vars. If you don't set `SHINYCMS_PLUGINS` then ShinyCMS will refuse to start.
1212

1313

1414
### Admin toolbar

0 commit comments

Comments
 (0)