Skip to content

Commit c7a8c66

Browse files
authored
Update rails to version 8.0.0 (#1244)
1 parent cbc21a4 commit c7a8c66

File tree

3 files changed

+60
-59
lines changed

3 files changed

+60
-59
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
77

88
gem "dotenv-rails"
99

10-
gem "rails", "~> 7.2.0"
10+
gem "rails", "~> 8.0.0"
1111

1212
gem "bcrypt"
1313
gem "bootsnap", require: false

Gemfile.lock

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,65 @@
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)
35-
actiontext (7.2.2)
36-
actionpack (= 7.2.2)
37-
activerecord (= 7.2.2)
38-
activestorage (= 7.2.2)
39-
activesupport (= 7.2.2)
34+
actiontext (8.0.0)
35+
actionpack (= 8.0.0)
36+
activerecord (= 8.0.0)
37+
activestorage (= 8.0.0)
38+
activesupport (= 8.0.0)
4039
globalid (>= 0.6.0)
4140
nokogiri (>= 1.8.5)
42-
actionview (7.2.2)
43-
activesupport (= 7.2.2)
41+
actionview (8.0.0)
42+
activesupport (= 8.0.0)
4443
builder (~> 3.1)
4544
erubi (~> 1.11)
4645
rails-dom-testing (~> 2.2)
4746
rails-html-sanitizer (~> 1.6)
48-
activejob (7.2.2)
49-
activesupport (= 7.2.2)
47+
activejob (8.0.0)
48+
activesupport (= 8.0.0)
5049
globalid (>= 0.3.6)
51-
activemodel (7.2.2)
52-
activesupport (= 7.2.2)
53-
activerecord (7.2.2)
54-
activemodel (= 7.2.2)
55-
activesupport (= 7.2.2)
50+
activemodel (8.0.0)
51+
activesupport (= 8.0.0)
52+
activerecord (8.0.0)
53+
activemodel (= 8.0.0)
54+
activesupport (= 8.0.0)
5655
timeout (>= 0.4.0)
57-
activestorage (7.2.2)
58-
actionpack (= 7.2.2)
59-
activejob (= 7.2.2)
60-
activerecord (= 7.2.2)
61-
activesupport (= 7.2.2)
56+
activestorage (8.0.0)
57+
actionpack (= 8.0.0)
58+
activejob (= 8.0.0)
59+
activerecord (= 8.0.0)
60+
activesupport (= 8.0.0)
6261
marcel (~> 1.0)
63-
activesupport (7.2.2)
62+
activesupport (8.0.0)
6463
base64
6564
benchmark (>= 0.3)
6665
bigdecimal
@@ -72,6 +71,7 @@ GEM
7271
minitest (>= 5.1)
7372
securerandom (>= 0.3)
7473
tzinfo (~> 2.0, >= 2.0.5)
74+
uri (>= 0.13.1)
7575
addressable (2.8.7)
7676
public_suffix (>= 2.0.2, < 7.0)
7777
ast (2.4.2)
@@ -232,30 +232,30 @@ GEM
232232
rack (>= 1.3)
233233
rackup (2.2.1)
234234
rack (>= 3)
235-
rails (7.2.2)
236-
actioncable (= 7.2.2)
237-
actionmailbox (= 7.2.2)
238-
actionmailer (= 7.2.2)
239-
actionpack (= 7.2.2)
240-
actiontext (= 7.2.2)
241-
actionview (= 7.2.2)
242-
activejob (= 7.2.2)
243-
activemodel (= 7.2.2)
244-
activerecord (= 7.2.2)
245-
activestorage (= 7.2.2)
246-
activesupport (= 7.2.2)
235+
rails (8.0.0)
236+
actioncable (= 8.0.0)
237+
actionmailbox (= 8.0.0)
238+
actionmailer (= 8.0.0)
239+
actionpack (= 8.0.0)
240+
actiontext (= 8.0.0)
241+
actionview (= 8.0.0)
242+
activejob (= 8.0.0)
243+
activemodel (= 8.0.0)
244+
activerecord (= 8.0.0)
245+
activestorage (= 8.0.0)
246+
activesupport (= 8.0.0)
247247
bundler (>= 1.15.0)
248-
railties (= 7.2.2)
248+
railties (= 8.0.0)
249249
rails-dom-testing (2.2.0)
250250
activesupport (>= 5.0.0)
251251
minitest
252252
nokogiri (>= 1.6)
253253
rails-html-sanitizer (1.6.0)
254254
loofah (~> 2.21)
255255
nokogiri (~> 1.14)
256-
railties (7.2.2)
257-
actionpack (= 7.2.2)
258-
activesupport (= 7.2.2)
256+
railties (8.0.0)
257+
actionpack (= 8.0.0)
258+
activesupport (= 8.0.0)
259259
irb (~> 1.13)
260260
rackup (>= 1.0.0)
261261
rake (>= 12.2)
@@ -364,6 +364,7 @@ GEM
364364
uglifier (4.2.1)
365365
execjs (>= 0.3.0, < 3)
366366
unicode-display_width (2.6.0)
367+
uri (1.0.1)
367368
useragent (0.16.10)
368369
virtus (2.0.0)
369370
axiom-types (~> 0.1)
@@ -414,7 +415,7 @@ DEPENDENCIES
414415
pry-byebug
415416
puma (~> 6.4)
416417
rack-ssl
417-
rails (~> 7.2.0)
418+
rails (~> 8.0.0)
418419
rspec
419420
rspec-rails
420421
rubocop

app/helpers/url_helpers.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ def expand_absolute_urls(content, base_url)
77
[["a", "href"], ["img", "src"], ["video", "src"]].each do |tag, attr|
88
doc.css("#{tag}[#{attr}]").each do |node|
99
url = node.get_attribute(attr)
10-
next if url =~ URI::DEFAULT_PARSER.regexp[:ABS_URI]
10+
next if url =~ URI::RFC2396_PARSER.regexp[:ABS_URI]
1111

12-
node.set_attribute(attr, URI.join(base_url, url).to_s)
12+
node.set_attribute(attr, URI.join(URI.parse(base_url), url).to_s)
1313
rescue URI::InvalidURIError
1414
# Just ignore. If we cannot parse the url, we don't want the entire
1515
# import to blow up.

0 commit comments

Comments
 (0)