Skip to content

Commit 113fa32

Browse files
musaprgmusaprg
authored
Merge pull request #676 from musaprg/update-rails-version
Update rails version to avoid mimemagic issues
2 parents fa0b73e + 023a191 commit 113fa32

File tree

4 files changed

+154
-5786
lines changed

4 files changed

+154
-5786
lines changed

‎Gemfile.lock

Lines changed: 117 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.3.2)
5-
actionpack (= 6.0.3.2)
4+
actioncable (6.0.3.7)
5+
actionpack (= 6.0.3.7)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.3.2)
9-
actionpack (= 6.0.3.2)
10-
activejob (= 6.0.3.2)
11-
activerecord (= 6.0.3.2)
12-
activestorage (= 6.0.3.2)
13-
activesupport (= 6.0.3.2)
8+
actionmailbox (6.0.3.7)
9+
actionpack (= 6.0.3.7)
10+
activejob (= 6.0.3.7)
11+
activerecord (= 6.0.3.7)
12+
activestorage (= 6.0.3.7)
13+
activesupport (= 6.0.3.7)
1414
mail (>= 2.7.1)
15-
actionmailer (6.0.3.2)
16-
actionpack (= 6.0.3.2)
17-
actionview (= 6.0.3.2)
18-
activejob (= 6.0.3.2)
15+
actionmailer (6.0.3.7)
16+
actionpack (= 6.0.3.7)
17+
actionview (= 6.0.3.7)
18+
activejob (= 6.0.3.7)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.3.2)
22-
actionview (= 6.0.3.2)
23-
activesupport (= 6.0.3.2)
21+
actionpack (6.0.3.7)
22+
actionview (= 6.0.3.7)
23+
activesupport (= 6.0.3.7)
2424
rack (~> 2.0, >= 2.0.8)
2525
rack-test (>= 0.6.3)
2626
rails-dom-testing (~> 2.0)
2727
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.3.2)
29-
actionpack (= 6.0.3.2)
30-
activerecord (= 6.0.3.2)
31-
activestorage (= 6.0.3.2)
32-
activesupport (= 6.0.3.2)
28+
actiontext (6.0.3.7)
29+
actionpack (= 6.0.3.7)
30+
activerecord (= 6.0.3.7)
31+
activestorage (= 6.0.3.7)
32+
activesupport (= 6.0.3.7)
3333
nokogiri (>= 1.8.5)
34-
actionview (6.0.3.2)
35-
activesupport (= 6.0.3.2)
34+
actionview (6.0.3.7)
35+
activesupport (= 6.0.3.7)
3636
builder (~> 3.1)
3737
erubi (~> 1.4)
3838
rails-dom-testing (~> 2.0)
3939
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40-
activejob (6.0.3.2)
41-
activesupport (= 6.0.3.2)
40+
activejob (6.0.3.7)
41+
activesupport (= 6.0.3.7)
4242
globalid (>= 0.3.6)
43-
activemodel (6.0.3.2)
44-
activesupport (= 6.0.3.2)
45-
activerecord (6.0.3.2)
46-
activemodel (= 6.0.3.2)
47-
activesupport (= 6.0.3.2)
48-
activestorage (6.0.3.2)
49-
actionpack (= 6.0.3.2)
50-
activejob (= 6.0.3.2)
51-
activerecord (= 6.0.3.2)
52-
marcel (~> 0.3.1)
53-
activesupport (6.0.3.2)
43+
activemodel (6.0.3.7)
44+
activesupport (= 6.0.3.7)
45+
activerecord (6.0.3.7)
46+
activemodel (= 6.0.3.7)
47+
activesupport (= 6.0.3.7)
48+
activestorage (6.0.3.7)
49+
actionpack (= 6.0.3.7)
50+
activejob (= 6.0.3.7)
51+
activerecord (= 6.0.3.7)
52+
marcel (~> 1.0.0)
53+
activesupport (6.0.3.7)
5454
concurrent-ruby (~> 1.0, >= 1.0.2)
5555
i18n (>= 0.7, < 2)
5656
minitest (~> 5.1)
5757
tzinfo (~> 1.1)
5858
zeitwerk (~> 2.2, >= 2.2.2)
5959
addressable (2.7.0)
6060
public_suffix (>= 2.0.2, < 5.0)
61-
ast (2.4.1)
62-
bcrypt (3.1.15)
61+
ast (2.4.2)
62+
bcrypt (3.1.16)
6363
bindex (0.8.1)
6464
builder (3.2.4)
6565
byebug (11.1.3)
66-
capybara (3.33.0)
66+
capybara (3.35.3)
6767
addressable
6868
mini_mime (>= 0.1.3)
6969
nokogiri (~> 1.8)
7070
rack (>= 1.6.0)
7171
rack-test (>= 0.6.3)
72-
regexp_parser (~> 1.5)
72+
regexp_parser (>= 1.5, < 3.0)
7373
xpath (~> 3.2)
74-
coderay (1.1.2)
74+
coderay (1.1.3)
7575
coffee-rails (5.0.0)
7676
coffee-script (>= 2.2.0)
7777
railties (>= 5.2.0)
7878
coffee-script (2.4.1)
7979
coffee-script-source
8080
execjs
8181
coffee-script-source (1.12.2)
82-
concurrent-ruby (1.1.7)
82+
concurrent-ruby (1.1.8)
8383
crass (1.0.6)
84-
devise (4.7.2)
84+
devise (4.8.0)
8585
bcrypt (~> 3.0)
8686
orm_adapter (~> 0.1)
8787
railties (>= 4.1.0)
8888
responders
8989
warden (~> 1.2.3)
90-
devise-i18n (1.9.2)
90+
devise-i18n (1.9.4)
9191
devise (>= 4.7.1)
92-
diff-lcs (1.3)
92+
diff-lcs (1.4.4)
9393
dotenv (2.7.6)
9494
dotenv-rails (2.7.6)
9595
dotenv (= 2.7.6)
9696
railties (>= 3.2)
97-
erubi (1.9.0)
97+
erubi (1.10.0)
9898
execjs (2.7.0)
99-
factory_bot (6.1.0)
99+
factory_bot (6.2.0)
100100
activesupport (>= 5.0.0)
101-
factory_bot_rails (6.1.0)
102-
factory_bot (~> 6.1.0)
101+
factory_bot_rails (6.2.0)
102+
factory_bot (~> 6.2.0)
103103
railties (>= 5.0.0)
104-
ffi (1.12.2)
104+
ffi (1.15.0)
105105
globalid (0.4.2)
106106
activesupport (>= 4.2.0)
107-
i18n (1.8.5)
107+
i18n (1.8.10)
108108
concurrent-ruby (~> 1.0)
109-
jbuilder (2.10.0)
109+
jbuilder (2.11.2)
110110
activesupport (>= 5.0.0)
111111
jquery-rails (4.4.0)
112112
rails-dom-testing (>= 1, < 3)
@@ -135,24 +135,23 @@ GEM
135135
listen (3.2.1)
136136
rb-fsevent (~> 0.10, >= 0.10.3)
137137
rb-inotify (~> 0.9, >= 0.9.10)
138-
loofah (2.6.0)
138+
loofah (2.9.1)
139139
crass (~> 1.0.2)
140140
nokogiri (>= 1.5.9)
141141
mail (2.7.1)
142142
mini_mime (>= 0.1.1)
143-
marcel (0.3.3)
144-
mimemagic (~> 0.3.2)
143+
marcel (1.0.1)
145144
method_source (1.0.0)
146-
mimemagic (0.3.5)
147-
mini_mime (1.0.2)
148-
mini_portile2 (2.4.0)
149-
minitest (5.14.1)
150-
nio4r (2.5.2)
151-
nokogiri (1.10.10)
152-
mini_portile2 (~> 2.4.0)
145+
mini_mime (1.1.0)
146+
mini_portile2 (2.5.1)
147+
minitest (5.14.4)
148+
nio4r (2.5.7)
149+
nokogiri (1.11.3)
150+
mini_portile2 (~> 2.5.0)
151+
racc (~> 1.4)
153152
orm_adapter (0.5.0)
154-
parallel (1.19.2)
155-
parser (2.7.1.4)
153+
parallel (1.20.1)
154+
parser (3.0.1.1)
156155
ast (~> 2.4.1)
157156
pg (1.2.3)
158157
pry (0.13.1)
@@ -161,26 +160,27 @@ GEM
161160
pry-byebug (3.9.0)
162161
byebug (~> 11.0)
163162
pry (~> 0.13.0)
164-
public_suffix (4.0.5)
165-
puma (4.3.5)
163+
public_suffix (4.0.6)
164+
puma (4.3.7)
166165
nio4r (~> 2.0)
166+
racc (1.5.2)
167167
rack (2.2.3)
168168
rack-test (1.1.0)
169169
rack (>= 1.0, < 3)
170-
rails (6.0.3.2)
171-
actioncable (= 6.0.3.2)
172-
actionmailbox (= 6.0.3.2)
173-
actionmailer (= 6.0.3.2)
174-
actionpack (= 6.0.3.2)
175-
actiontext (= 6.0.3.2)
176-
actionview (= 6.0.3.2)
177-
activejob (= 6.0.3.2)
178-
activemodel (= 6.0.3.2)
179-
activerecord (= 6.0.3.2)
180-
activestorage (= 6.0.3.2)
181-
activesupport (= 6.0.3.2)
170+
rails (6.0.3.7)
171+
actioncable (= 6.0.3.7)
172+
actionmailbox (= 6.0.3.7)
173+
actionmailer (= 6.0.3.7)
174+
actionpack (= 6.0.3.7)
175+
actiontext (= 6.0.3.7)
176+
actionview (= 6.0.3.7)
177+
activejob (= 6.0.3.7)
178+
activemodel (= 6.0.3.7)
179+
activerecord (= 6.0.3.7)
180+
activestorage (= 6.0.3.7)
181+
activesupport (= 6.0.3.7)
182182
bundler (>= 1.3.0)
183-
railties (= 6.0.3.2)
183+
railties (= 6.0.3.7)
184184
sprockets-rails (>= 2.0.0)
185185
rails-controller-testing (1.0.5)
186186
actionpack (>= 5.0.1.rc1)
@@ -191,54 +191,54 @@ GEM
191191
nokogiri (>= 1.6)
192192
rails-html-sanitizer (1.3.0)
193193
loofah (~> 2.3)
194-
railties (6.0.3.2)
195-
actionpack (= 6.0.3.2)
196-
activesupport (= 6.0.3.2)
194+
railties (6.0.3.7)
195+
actionpack (= 6.0.3.7)
196+
activesupport (= 6.0.3.7)
197197
method_source
198198
rake (>= 0.8.7)
199199
thor (>= 0.20.3, < 2.0)
200200
rainbow (3.0.0)
201-
rake (13.0.1)
201+
rake (13.0.3)
202202
rb-fsevent (0.10.4)
203203
rb-inotify (0.10.1)
204204
ffi (~> 1.0)
205-
regexp_parser (1.7.1)
205+
regexp_parser (2.1.1)
206206
responders (3.0.1)
207207
actionpack (>= 5.0)
208208
railties (>= 5.0)
209-
rexml (3.2.4)
210-
rspec-core (3.9.2)
211-
rspec-support (~> 3.9.3)
212-
rspec-expectations (3.9.2)
209+
rexml (3.2.5)
210+
rspec-core (3.10.1)
211+
rspec-support (~> 3.10.0)
212+
rspec-expectations (3.10.1)
213213
diff-lcs (>= 1.2.0, < 2.0)
214-
rspec-support (~> 3.9.0)
215-
rspec-mocks (3.9.1)
214+
rspec-support (~> 3.10.0)
215+
rspec-mocks (3.10.2)
216216
diff-lcs (>= 1.2.0, < 2.0)
217-
rspec-support (~> 3.9.0)
218-
rspec-rails (4.0.1)
219-
actionpack (>= 4.2)
220-
activesupport (>= 4.2)
221-
railties (>= 4.2)
222-
rspec-core (~> 3.9)
223-
rspec-expectations (~> 3.9)
224-
rspec-mocks (~> 3.9)
225-
rspec-support (~> 3.9)
226-
rspec-support (3.9.3)
227-
rubocop (0.90.0)
217+
rspec-support (~> 3.10.0)
218+
rspec-rails (5.0.1)
219+
actionpack (>= 5.2)
220+
activesupport (>= 5.2)
221+
railties (>= 5.2)
222+
rspec-core (~> 3.10)
223+
rspec-expectations (~> 3.10)
224+
rspec-mocks (~> 3.10)
225+
rspec-support (~> 3.10)
226+
rspec-support (3.10.2)
227+
rubocop (1.14.0)
228228
parallel (~> 1.10)
229-
parser (>= 2.7.1.1)
229+
parser (>= 3.0.0.0)
230230
rainbow (>= 2.2.2, < 4.0)
231-
regexp_parser (>= 1.7)
231+
regexp_parser (>= 1.8, < 3.0)
232232
rexml
233-
rubocop-ast (>= 0.3.0, < 1.0)
233+
rubocop-ast (>= 1.5.0, < 2.0)
234234
ruby-progressbar (~> 1.7)
235-
unicode-display_width (>= 1.4.0, < 2.0)
236-
rubocop-ast (0.3.0)
237-
parser (>= 2.7.1.4)
238-
ruby-progressbar (1.10.1)
235+
unicode-display_width (>= 1.4.0, < 3.0)
236+
rubocop-ast (1.5.0)
237+
parser (>= 3.0.1.1)
238+
ruby-progressbar (1.11.0)
239239
sass-rails (6.0.0)
240240
sassc-rails (~> 2.1, >= 2.1.1)
241-
sassc (2.3.0)
241+
sassc (2.4.0)
242242
ffi (~> 1.9)
243243
sassc-rails (2.1.2)
244244
railties (>= 4.0.0)
@@ -253,34 +253,34 @@ GEM
253253
sprockets (4.0.2)
254254
concurrent-ruby (~> 1.0)
255255
rack (> 1, < 3)
256-
sprockets-rails (3.2.1)
256+
sprockets-rails (3.2.2)
257257
actionpack (>= 4.0)
258258
activesupport (>= 4.0)
259259
sprockets (>= 3.0.0)
260-
thor (1.0.1)
260+
thor (1.1.0)
261261
thread_safe (0.3.6)
262262
tilt (2.0.10)
263263
turbolinks (5.2.1)
264264
turbolinks-source (~> 5.2)
265265
turbolinks-source (5.2.0)
266-
tzinfo (1.2.7)
266+
tzinfo (1.2.9)
267267
thread_safe (~> 0.1)
268268
uglifier (4.2.0)
269269
execjs (>= 0.3.0, < 3)
270-
unicode-display_width (1.7.0)
271-
warden (1.2.8)
272-
rack (>= 2.0.6)
273-
web-console (4.0.4)
270+
unicode-display_width (2.0.0)
271+
warden (1.2.9)
272+
rack (>= 2.0.9)
273+
web-console (4.1.0)
274274
actionview (>= 6.0.0)
275275
activemodel (>= 6.0.0)
276276
bindex (>= 0.4.0)
277277
railties (>= 6.0.0)
278-
websocket-driver (0.7.2)
278+
websocket-driver (0.7.3)
279279
websocket-extensions (>= 0.1.0)
280280
websocket-extensions (0.1.5)
281281
xpath (3.2.0)
282282
nokogiri (~> 1.8)
283-
zeitwerk (2.4.0)
283+
zeitwerk (2.4.2)
284284

285285
PLATFORMS
286286
ruby

0 commit comments

Comments
 (0)