Skip to content

Commit 50e5375

Browse files
committed
Upgrade Rails to 8.0
1 parent ad83428 commit 50e5375

File tree

7 files changed

+71
-85
lines changed

7 files changed

+71
-85
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ gem "waveform"
3939
gem "will_paginate"
4040

4141
group :development do
42-
gem "bullet"
42+
# gem "bullet" TODO: Re-add when Rails 8 compatible
4343
gem "dotenv-rails"
4444
gem "rubocop-capybara"
4545
gem "rubocop-factory_bot"

Gemfile.lock

+65-70
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,67 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.2.2)
5-
actionpack (= 7.2.2)
6-
activesupport (= 7.2.2)
4+
actioncable (8.0.0)
5+
actionpack (= 8.0.0)
6+
activesupport (= 8.0.0)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (7.2.2)
11-
actionpack (= 7.2.2)
12-
activejob (= 7.2.2)
13-
activerecord (= 7.2.2)
14-
activestorage (= 7.2.2)
15-
activesupport (= 7.2.2)
10+
actionmailbox (8.0.0)
11+
actionpack (= 8.0.0)
12+
activejob (= 8.0.0)
13+
activerecord (= 8.0.0)
14+
activestorage (= 8.0.0)
15+
activesupport (= 8.0.0)
1616
mail (>= 2.8.0)
17-
actionmailer (7.2.2)
18-
actionpack (= 7.2.2)
19-
actionview (= 7.2.2)
20-
activejob (= 7.2.2)
21-
activesupport (= 7.2.2)
17+
actionmailer (8.0.0)
18+
actionpack (= 8.0.0)
19+
actionview (= 8.0.0)
20+
activejob (= 8.0.0)
21+
activesupport (= 8.0.0)
2222
mail (>= 2.8.0)
2323
rails-dom-testing (~> 2.2)
24-
actionpack (7.2.2)
25-
actionview (= 7.2.2)
26-
activesupport (= 7.2.2)
24+
actionpack (8.0.0)
25+
actionview (= 8.0.0)
26+
activesupport (= 8.0.0)
2727
nokogiri (>= 1.8.5)
28-
racc
29-
rack (>= 2.2.4, < 3.2)
28+
rack (>= 2.2.4)
3029
rack-session (>= 1.0.1)
3130
rack-test (>= 0.6.3)
3231
rails-dom-testing (~> 2.2)
3332
rails-html-sanitizer (~> 1.6)
3433
useragent (~> 0.16)
3534
actionpack-action_caching (1.2.2)
3635
actionpack (>= 4.0.0)
37-
actiontext (7.2.2)
38-
actionpack (= 7.2.2)
39-
activerecord (= 7.2.2)
40-
activestorage (= 7.2.2)
41-
activesupport (= 7.2.2)
36+
actiontext (8.0.0)
37+
actionpack (= 8.0.0)
38+
activerecord (= 8.0.0)
39+
activestorage (= 8.0.0)
40+
activesupport (= 8.0.0)
4241
globalid (>= 0.6.0)
4342
nokogiri (>= 1.8.5)
44-
actionview (7.2.2)
45-
activesupport (= 7.2.2)
43+
actionview (8.0.0)
44+
activesupport (= 8.0.0)
4645
builder (~> 3.1)
4746
erubi (~> 1.11)
4847
rails-dom-testing (~> 2.2)
4948
rails-html-sanitizer (~> 1.6)
50-
activejob (7.2.2)
51-
activesupport (= 7.2.2)
49+
activejob (8.0.0)
50+
activesupport (= 8.0.0)
5251
globalid (>= 0.3.6)
53-
activemodel (7.2.2)
54-
activesupport (= 7.2.2)
55-
activerecord (7.2.2)
56-
activemodel (= 7.2.2)
57-
activesupport (= 7.2.2)
52+
activemodel (8.0.0)
53+
activesupport (= 8.0.0)
54+
activerecord (8.0.0)
55+
activemodel (= 8.0.0)
56+
activesupport (= 8.0.0)
5857
timeout (>= 0.4.0)
59-
activestorage (7.2.2)
60-
actionpack (= 7.2.2)
61-
activejob (= 7.2.2)
62-
activerecord (= 7.2.2)
63-
activesupport (= 7.2.2)
58+
activestorage (8.0.0)
59+
actionpack (= 8.0.0)
60+
activejob (= 8.0.0)
61+
activerecord (= 8.0.0)
62+
activesupport (= 8.0.0)
6463
marcel (~> 1.0)
65-
activesupport (7.2.2)
64+
activesupport (8.0.0)
6665
base64
6766
benchmark (>= 0.3)
6867
bigdecimal
@@ -74,17 +73,15 @@ GEM
7473
minitest (>= 5.1)
7574
securerandom (>= 0.3)
7675
tzinfo (~> 2.0, >= 2.0.5)
76+
uri (>= 0.13.1)
7777
addressable (2.8.7)
7878
public_suffix (>= 2.0.2, < 7.0)
7979
ast (2.4.2)
8080
base64 (0.2.0)
8181
bcrypt (3.1.20)
82-
benchmark (0.3.0)
82+
benchmark (0.4.0)
8383
bigdecimal (3.1.8)
8484
builder (3.3.0)
85-
bullet (7.2.0)
86-
activesupport (>= 3.0.0)
87-
uniform_notifier (~> 1.11)
8885
capybara (3.40.0)
8986
addressable
9087
matrix
@@ -221,7 +218,7 @@ GEM
221218
irb (1.14.1)
222219
rdoc (>= 4.0.0)
223220
reline (>= 0.4.2)
224-
json (2.7.5)
221+
json (2.8.1)
225222
jwt (2.9.3)
226223
base64
227224
language_server-protocol (3.17.0.3)
@@ -250,7 +247,7 @@ GEM
250247
mustermann-grape (1.1.0)
251248
mustermann (>= 1.0.0)
252249
mutex_m (0.2.0)
253-
net-http (0.4.1)
250+
net-http (0.5.0)
254251
uri
255252
net-imap (0.5.0)
256253
date
@@ -281,14 +278,14 @@ GEM
281278
os (1.1.4)
282279
package_json (0.1.0)
283280
parallel (1.26.3)
284-
parser (3.3.5.1)
281+
parser (3.3.6.0)
285282
ast (~> 2.4.1)
286283
racc
287284
pg (1.5.9)
288285
pg_search (2.3.7)
289286
activerecord (>= 6.1)
290287
activesupport (>= 6.1)
291-
psych (5.1.2)
288+
psych (5.2.0)
292289
stringio
293290
public_suffix (6.0.1)
294291
puma (6.4.3)
@@ -306,30 +303,30 @@ GEM
306303
rack (>= 1.3)
307304
rackup (2.2.0)
308305
rack (>= 3)
309-
rails (7.2.2)
310-
actioncable (= 7.2.2)
311-
actionmailbox (= 7.2.2)
312-
actionmailer (= 7.2.2)
313-
actionpack (= 7.2.2)
314-
actiontext (= 7.2.2)
315-
actionview (= 7.2.2)
316-
activejob (= 7.2.2)
317-
activemodel (= 7.2.2)
318-
activerecord (= 7.2.2)
319-
activestorage (= 7.2.2)
320-
activesupport (= 7.2.2)
306+
rails (8.0.0)
307+
actioncable (= 8.0.0)
308+
actionmailbox (= 8.0.0)
309+
actionmailer (= 8.0.0)
310+
actionpack (= 8.0.0)
311+
actiontext (= 8.0.0)
312+
actionview (= 8.0.0)
313+
activejob (= 8.0.0)
314+
activemodel (= 8.0.0)
315+
activerecord (= 8.0.0)
316+
activestorage (= 8.0.0)
317+
activesupport (= 8.0.0)
321318
bundler (>= 1.15.0)
322-
railties (= 7.2.2)
319+
railties (= 8.0.0)
323320
rails-dom-testing (2.2.0)
324321
activesupport (>= 5.0.0)
325322
minitest
326323
nokogiri (>= 1.6)
327324
rails-html-sanitizer (1.6.0)
328325
loofah (~> 2.21)
329326
nokogiri (~> 1.14)
330-
railties (7.2.2)
331-
actionpack (= 7.2.2)
332-
activesupport (= 7.2.2)
327+
railties (8.0.0)
328+
actionpack (= 8.0.0)
329+
activesupport (= 8.0.0)
333330
irb (~> 1.13)
334331
rackup (>= 1.0.0)
335332
rake (>= 12.2)
@@ -383,7 +380,7 @@ GEM
383380
rubocop-ast (>= 1.32.2, < 2.0)
384381
ruby-progressbar (~> 1.7)
385382
unicode-display_width (>= 2.4.0, < 3.0)
386-
rubocop-ast (1.33.1)
383+
rubocop-ast (1.34.1)
387384
parser (>= 3.3.1.0)
388385
rubocop-capybara (2.21.0)
389386
rubocop (~> 1.41)
@@ -444,7 +441,7 @@ GEM
444441
semantic_range (>= 2.3.0)
445442
shoulda-matchers (6.4.0)
446443
activesupport (>= 5.2.0)
447-
sidekiq (7.3.4)
444+
sidekiq (7.3.5)
448445
connection_pool (>= 2.3.0)
449446
logger
450447
rack (>= 2.2.4)
@@ -476,20 +473,19 @@ GEM
476473
bcrypt (~> 3.1)
477474
oauth (>= 0.6)
478475
oauth2 (~> 2.0)
479-
stringio (3.1.1)
476+
stringio (3.1.2)
480477
temple (0.10.3)
481478
thor (1.3.2)
482479
tilt (2.4.0)
483-
timeout (0.4.1)
480+
timeout (0.4.2)
484481
trailblazer-option (0.1.2)
485482
typhoeus (1.4.1)
486483
ethon (>= 0.9.0)
487484
tzinfo (2.0.6)
488485
concurrent-ruby (~> 1.0)
489486
uber (0.1.0)
490487
unicode-display_width (2.6.0)
491-
uniform_notifier (1.16.0)
492-
uri (0.13.1)
488+
uri (1.0.0)
493489
useragent (0.16.10)
494490
version_gem (1.1.4)
495491
waveform (0.1.3)
@@ -510,7 +506,6 @@ PLATFORMS
510506

511507
DEPENDENCIES
512508
actionpack-action_caching
513-
bullet
514509
capybara
515510
capybara-email
516511
capybara-screenshot

app/javascript/components/Eras.jsx

+2-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import GitHubButton from "./pages/GitHubButton";
2929
import DiscordButton from "./pages/DiscordButton";
3030
import CoverArt from "./CoverArt";
3131
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
32-
import { faList, faTh, faRss, faSortAmountDown, faSortAmountUp } from "@fortawesome/free-solid-svg-icons";
32+
import { faList, faTh, faSortAmountDown, faSortAmountUp } from "@fortawesome/free-solid-svg-icons";
3333

3434
const Eras = () => {
3535
const eras = useLoaderData();
@@ -138,13 +138,9 @@ const Eras = () => {
138138
<MobileApps className="mt-5" />
139139

140140
<div className="hidden-mobile">
141-
<p className="has-text-weight-bold mb-2 mt-5 project-open-source">This project is open source</p>
141+
<p className="has-text-weight-bold mb-2 mt-3 project-open-source">This project is open source</p>
142142
<GitHubButton className="mr-2" />
143143
<DiscordButton />
144-
<a href="/feeds/rss" className="button mt-2" target="_blank">
145-
<FontAwesomeIcon icon={faRss} className="mr-1" />
146-
RSS
147-
</a>
148144
</div>
149145
</div>
150146
);

app/javascript/components/layout/Navbar.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useRef, useState, useEffect } from "react";
22
import { Link, useNavigate } from "react-router-dom";
33
import logo from "../../images/logo-350.png";
44
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
5-
import { faQuestionCircle, faBook, faTags, faAddressBook, faUserShield, faFileContract, faCalendar, faMicrophone, faMapMarkerAlt, faAward, faCalendarDay, faSearch, faAngleDown, faRecordVinyl, faGuitar, faChevronDown, faCircleXmark, faRightToBracket, faGear, faClipboardList, faListCheck, faListOl, faDiceFive, faLandmark } from "@fortawesome/free-solid-svg-icons";
5+
import { faQuestionCircle, faBook, faTags, faAddressBook, faUserShield, faFileContract, faCalendar, faMicrophone, faMapMarkerAlt, faAward, faCalendarDay, faSearch, faAngleDown, faRecordVinyl, faGuitar, faChevronDown, faCircleXmark, faRightToBracket, faGear, faClipboardList, faListCheck, faListOl, faDiceFive, faLandmark, faRss } from "@fortawesome/free-solid-svg-icons";
66

77
const Navbar = ({ user, handleLogout }) => {
88
const [isMenuOpen, setIsMenuOpen] = useState(false);
@@ -52,6 +52,7 @@ const Navbar = ({ user, handleLogout }) => {
5252
const staticLinks = [
5353
{ path: "/faq", label: "FAQ", icon: faQuestionCircle },
5454
{ path: "/api-docs", label: "API Docs", icon: faBook },
55+
{ path: "/rss", label: "RSS Feed", icon: faRss },
5556
{ path: "/tagin-project", label: "Tagin' Project", icon: faTags },
5657
{ path: "/contact-info", label: "Contact Info", icon: faAddressBook },
5758
{ path: "/privacy", label: "Privacy Policy", icon: faUserShield },

config/application.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Application < Rails::Application
3535
config.album_zip_disk_limit = 150.gigabytes
3636

3737
# Rails config
38-
config.load_defaults 7.2
38+
config.load_defaults 8.0
3939
config.active_job.queue_adapter = :sidekiq
4040
config.action_mailer.default_url_options = { host: config.base_url }
4141
config.action_mailer.smtp_settings = {

config/environments/development.rb

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@
1515
config.consider_all_requests_local = true
1616
config.eager_load = false
1717
config.whiny_nils = true
18-
19-
# Bullet gem (N+1 queries)
20-
Bullet.enable = true
21-
Bullet.bullet_logger = true
22-
Bullet.rails_logger = true
2318
end

spec/features/homepage_spec.rb

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
expect(page).to have_selector(".mobile-apps")
5353
expect(page).to have_link("GitHub")
5454
expect(page).to have_link("Discord")
55-
expect(page).to have_link("RSS", href: "/feeds/rss")
5655
end
5756

5857
within("#main-content") do

0 commit comments

Comments
 (0)