Skip to content

Commit e17cf6e

Browse files
committed
Update rails past 5.2.5 to work around yanked mimemagic
See these links for context: * rails/rails#41750 * https://rubyonrails.org/2021/3/26/marcel-upgrade-releases
1 parent fb3f661 commit e17cf6e

5 files changed

+342
-332
lines changed
Lines changed: 70 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ..
33
specs:
4-
react-rails (2.6.1)
4+
react-rails (2.6.2)
55
babel-transpiler (>= 0.7.0)
66
connection_pool
77
execjs
@@ -11,43 +11,43 @@ PATH
1111
GEM
1212
remote: http://rubygems.org/
1313
specs:
14-
actioncable (5.2.4.1)
15-
actionpack (= 5.2.4.1)
14+
actioncable (5.2.8.1)
15+
actionpack (= 5.2.8.1)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
18-
actionmailer (5.2.4.1)
19-
actionpack (= 5.2.4.1)
20-
actionview (= 5.2.4.1)
21-
activejob (= 5.2.4.1)
18+
actionmailer (5.2.8.1)
19+
actionpack (= 5.2.8.1)
20+
actionview (= 5.2.8.1)
21+
activejob (= 5.2.8.1)
2222
mail (~> 2.5, >= 2.5.4)
2323
rails-dom-testing (~> 2.0)
24-
actionpack (5.2.4.1)
25-
actionview (= 5.2.4.1)
26-
activesupport (= 5.2.4.1)
24+
actionpack (5.2.8.1)
25+
actionview (= 5.2.8.1)
26+
activesupport (= 5.2.8.1)
2727
rack (~> 2.0, >= 2.0.8)
2828
rack-test (>= 0.6.3)
2929
rails-dom-testing (~> 2.0)
3030
rails-html-sanitizer (~> 1.0, >= 1.0.2)
31-
actionview (5.2.4.1)
32-
activesupport (= 5.2.4.1)
31+
actionview (5.2.8.1)
32+
activesupport (= 5.2.8.1)
3333
builder (~> 3.1)
3434
erubi (~> 1.4)
3535
rails-dom-testing (~> 2.0)
3636
rails-html-sanitizer (~> 1.0, >= 1.0.3)
37-
activejob (5.2.4.1)
38-
activesupport (= 5.2.4.1)
37+
activejob (5.2.8.1)
38+
activesupport (= 5.2.8.1)
3939
globalid (>= 0.3.6)
40-
activemodel (5.2.4.1)
41-
activesupport (= 5.2.4.1)
42-
activerecord (5.2.4.1)
43-
activemodel (= 5.2.4.1)
44-
activesupport (= 5.2.4.1)
40+
activemodel (5.2.8.1)
41+
activesupport (= 5.2.8.1)
42+
activerecord (5.2.8.1)
43+
activemodel (= 5.2.8.1)
44+
activesupport (= 5.2.8.1)
4545
arel (>= 9.0)
46-
activestorage (5.2.4.1)
47-
actionpack (= 5.2.4.1)
48-
activerecord (= 5.2.4.1)
49-
marcel (~> 0.3.1)
50-
activesupport (5.2.4.1)
46+
activestorage (5.2.8.1)
47+
actionpack (= 5.2.8.1)
48+
activerecord (= 5.2.8.1)
49+
marcel (~> 1.0.0)
50+
activesupport (5.2.8.1)
5151
concurrent-ruby (~> 1.0, >= 1.0.2)
5252
i18n (>= 0.7, < 2)
5353
minitest (~> 5.1)
@@ -84,19 +84,19 @@ GEM
8484
coffee-script-source
8585
execjs
8686
coffee-script-source (1.12.2)
87-
concurrent-ruby (1.1.5)
87+
concurrent-ruby (1.1.10)
8888
connection_pool (2.2.2)
89-
crass (1.0.5)
89+
crass (1.0.6)
9090
docile (1.1.5)
91-
erubi (1.9.0)
91+
erubi (1.11.0)
9292
es5-shim-rails (4.0.1)
9393
actionpack (>= 3.1)
9494
railties (>= 3.1)
9595
execjs (2.7.0)
9696
ffi (1.11.3)
9797
formatador (0.2.5)
98-
globalid (0.4.2)
99-
activesupport (>= 4.2.0)
98+
globalid (0.6.0)
99+
activesupport (>= 5.0)
100100
guard (2.16.1)
101101
formatador (>= 0.2.4)
102102
listen (>= 2.7, < 4.0)
@@ -110,31 +110,30 @@ GEM
110110
guard-minitest (2.4.6)
111111
guard-compat (~> 1.2)
112112
minitest (>= 3.0)
113-
i18n (1.7.0)
113+
i18n (1.12.0)
114114
concurrent-ruby (~> 1.0)
115115
jbuilder (2.9.1)
116116
activesupport (>= 4.2.0)
117117
json (2.3.0)
118118
listen (3.0.8)
119119
rb-fsevent (~> 0.9, >= 0.9.4)
120120
rb-inotify (~> 0.9, >= 0.9.7)
121-
loofah (2.4.0)
121+
loofah (2.18.0)
122122
crass (~> 1.0.2)
123123
nokogiri (>= 1.5.9)
124124
lumberjack (1.0.13)
125125
mail (2.7.1)
126126
mini_mime (>= 0.1.1)
127-
marcel (0.3.3)
128-
mimemagic (~> 0.3.2)
127+
marcel (1.0.2)
129128
method_source (0.9.2)
130-
mimemagic (0.3.10)
131-
mini_mime (1.0.2)
132-
mini_portile2 (2.4.0)
133-
minitest (5.13.0)
129+
mini_mime (1.1.2)
130+
mini_portile2 (2.8.0)
131+
minitest (5.16.3)
134132
nenv (0.3.0)
135-
nio4r (2.5.2)
136-
nokogiri (1.10.7)
137-
mini_portile2 (~> 2.4.0)
133+
nio4r (2.5.8)
134+
nokogiri (1.13.8)
135+
mini_portile2 (~> 2.8.0)
136+
racc (~> 1.4)
138137
notiffany (0.1.3)
139138
nenv (~> 0.1)
140139
shellany (~> 0.0)
@@ -145,34 +144,35 @@ GEM
145144
byebug (~> 11.0)
146145
pry (~> 0.10)
147146
public_suffix (4.0.2)
148-
rack (2.0.8)
147+
racc (1.6.0)
148+
rack (2.2.4)
149149
rack-test (1.1.0)
150150
rack (>= 1.0, < 3)
151-
rails (5.2.4.1)
152-
actioncable (= 5.2.4.1)
153-
actionmailer (= 5.2.4.1)
154-
actionpack (= 5.2.4.1)
155-
actionview (= 5.2.4.1)
156-
activejob (= 5.2.4.1)
157-
activemodel (= 5.2.4.1)
158-
activerecord (= 5.2.4.1)
159-
activestorage (= 5.2.4.1)
160-
activesupport (= 5.2.4.1)
151+
rails (5.2.8.1)
152+
actioncable (= 5.2.8.1)
153+
actionmailer (= 5.2.8.1)
154+
actionpack (= 5.2.8.1)
155+
actionview (= 5.2.8.1)
156+
activejob (= 5.2.8.1)
157+
activemodel (= 5.2.8.1)
158+
activerecord (= 5.2.8.1)
159+
activestorage (= 5.2.8.1)
160+
activesupport (= 5.2.8.1)
161161
bundler (>= 1.3.0)
162-
railties (= 5.2.4.1)
162+
railties (= 5.2.8.1)
163163
sprockets-rails (>= 2.0.0)
164164
rails-dom-testing (2.0.3)
165165
activesupport (>= 4.2.0)
166166
nokogiri (>= 1.6)
167-
rails-html-sanitizer (1.3.0)
167+
rails-html-sanitizer (1.4.3)
168168
loofah (~> 2.3)
169-
railties (5.2.4.1)
170-
actionpack (= 5.2.4.1)
171-
activesupport (= 5.2.4.1)
169+
railties (5.2.8.1)
170+
actionpack (= 5.2.8.1)
171+
activesupport (= 5.2.8.1)
172172
method_source
173173
rake (>= 0.8.7)
174174
thor (>= 0.19.0, < 2.0)
175-
rake (13.0.1)
175+
rake (13.0.6)
176176
rb-fsevent (0.10.3)
177177
rb-inotify (0.10.1)
178178
ffi (~> 1.0)
@@ -187,26 +187,29 @@ GEM
187187
json (>= 1.8, < 3)
188188
simplecov-html (~> 0.10.0)
189189
simplecov-html (0.10.2)
190-
sprockets (4.0.0)
190+
sprockets (4.1.1)
191191
concurrent-ruby (~> 1.0)
192192
rack (> 1, < 3)
193-
sprockets-rails (3.2.1)
194-
actionpack (>= 4.0)
195-
activesupport (>= 4.0)
193+
sprockets-rails (3.4.2)
194+
actionpack (>= 5.2)
195+
activesupport (>= 5.2)
196196
sprockets (>= 3.0.0)
197197
test-unit (2.5.5)
198-
thor (1.0.1)
198+
thor (1.2.1)
199199
thread_safe (0.3.6)
200200
tilt (2.0.10)
201-
tzinfo (1.2.6)
201+
turbolinks (5.2.1)
202+
turbolinks-source (~> 5.2)
203+
turbolinks-source (5.2.0)
204+
tzinfo (1.2.10)
202205
thread_safe (~> 0.1)
203206
webdrivers (4.2.0)
204207
nokogiri (~> 1.6)
205208
rubyzip (>= 1.3.0)
206209
selenium-webdriver (>= 3.0, < 4.0)
207-
websocket-driver (0.7.1)
210+
websocket-driver (0.7.5)
208211
websocket-extensions (>= 0.1.0)
209-
websocket-extensions (0.1.4)
212+
websocket-extensions (0.1.5)
210213
xpath (3.2.0)
211214
nokogiri (~> 1.8)
212215

@@ -229,7 +232,8 @@ DEPENDENCIES
229232
react-rails!
230233
selenium-webdriver
231234
test-unit (~> 2.5)
235+
turbolinks
232236
webdrivers
233237

234238
BUNDLED WITH
235-
2.1.2
239+
2.1.4

0 commit comments

Comments
 (0)