Skip to content

Commit 80fbfa5

Browse files
authored
fix ci: conflicts with removed gems (ctran#865)
1 parent e075a21 commit 80fbfa5

File tree

2 files changed

+83
-81
lines changed

2 files changed

+83
-81
lines changed

Diff for: spec/integration/rails_5.2.4.1/Gemfile.lock

+66-68
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,43 @@ PATH
88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actioncable (5.2.4.1)
12-
actionpack (= 5.2.4.1)
11+
actioncable (5.2.5)
12+
actionpack (= 5.2.5)
1313
nio4r (~> 2.0)
1414
websocket-driver (>= 0.6.1)
15-
actionmailer (5.2.4.1)
16-
actionpack (= 5.2.4.1)
17-
actionview (= 5.2.4.1)
18-
activejob (= 5.2.4.1)
15+
actionmailer (5.2.5)
16+
actionpack (= 5.2.5)
17+
actionview (= 5.2.5)
18+
activejob (= 5.2.5)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 2.0)
21-
actionpack (5.2.4.1)
22-
actionview (= 5.2.4.1)
23-
activesupport (= 5.2.4.1)
21+
actionpack (5.2.5)
22+
actionview (= 5.2.5)
23+
activesupport (= 5.2.5)
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.0.2)
28-
actionview (5.2.4.1)
29-
activesupport (= 5.2.4.1)
28+
actionview (5.2.5)
29+
activesupport (= 5.2.5)
3030
builder (~> 3.1)
3131
erubi (~> 1.4)
3232
rails-dom-testing (~> 2.0)
3333
rails-html-sanitizer (~> 1.0, >= 1.0.3)
34-
activejob (5.2.4.1)
35-
activesupport (= 5.2.4.1)
34+
activejob (5.2.5)
35+
activesupport (= 5.2.5)
3636
globalid (>= 0.3.6)
37-
activemodel (5.2.4.1)
38-
activesupport (= 5.2.4.1)
39-
activerecord (5.2.4.1)
40-
activemodel (= 5.2.4.1)
41-
activesupport (= 5.2.4.1)
37+
activemodel (5.2.5)
38+
activesupport (= 5.2.5)
39+
activerecord (5.2.5)
40+
activemodel (= 5.2.5)
41+
activesupport (= 5.2.5)
4242
arel (>= 9.0)
43-
activestorage (5.2.4.1)
44-
actionpack (= 5.2.4.1)
45-
activerecord (= 5.2.4.1)
46-
marcel (~> 0.3.1)
47-
activesupport (5.2.4.1)
43+
activestorage (5.2.5)
44+
actionpack (= 5.2.5)
45+
activerecord (= 5.2.5)
46+
marcel (~> 1.0.0)
47+
activesupport (5.2.5)
4848
concurrent-ruby (~> 1.0, >= 1.0.2)
4949
i18n (>= 0.7, < 2)
5050
minitest (~> 5.1)
@@ -55,11 +55,11 @@ GEM
5555
io-like (~> 0.3.0)
5656
arel (9.0.0)
5757
bindex (0.8.1)
58-
bootsnap (1.4.5)
58+
bootsnap (1.7.3)
5959
msgpack (~> 1.0)
6060
builder (3.2.4)
61-
byebug (11.1.1)
62-
capybara (3.31.0)
61+
byebug (11.1.3)
62+
capybara (3.32.2)
6363
addressable
6464
mini_mime (>= 0.1.3)
6565
nokogiri (~> 1.8)
@@ -78,75 +78,73 @@ GEM
7878
coffee-script-source
7979
execjs
8080
coffee-script-source (1.12.2)
81-
concurrent-ruby (1.1.5)
81+
concurrent-ruby (1.1.8)
8282
crass (1.0.6)
83-
erubi (1.9.0)
83+
erubi (1.10.0)
8484
execjs (2.7.0)
85-
ffi (1.12.2)
85+
ffi (1.15.0)
8686
globalid (0.4.2)
8787
activesupport (>= 4.2.0)
88-
i18n (1.8.2)
88+
i18n (1.8.10)
8989
concurrent-ruby (~> 1.0)
90-
io-like (0.3.0)
91-
jbuilder (2.9.1)
92-
activesupport (>= 4.2.0)
90+
io-like (0.3.1)
91+
jbuilder (2.11.2)
92+
activesupport (>= 5.0.0)
9393
listen (3.1.5)
9494
rb-fsevent (~> 0.9, >= 0.9.4)
9595
rb-inotify (~> 0.9, >= 0.9.7)
9696
ruby_dep (~> 1.2)
97-
loofah (2.4.0)
97+
loofah (2.9.0)
9898
crass (~> 1.0.2)
9999
nokogiri (>= 1.5.9)
100100
mail (2.7.1)
101101
mini_mime (>= 0.1.1)
102-
marcel (0.3.3)
103-
mimemagic (~> 0.3.2)
104-
method_source (0.9.2)
105-
mimemagic (0.3.4)
106-
mini_mime (1.0.2)
102+
marcel (1.0.1)
103+
method_source (1.0.0)
104+
mini_mime (1.0.3)
107105
mini_portile2 (2.4.0)
108-
minitest (5.14.0)
109-
msgpack (1.3.2)
110-
nio4r (2.5.2)
111-
nokogiri (1.10.8)
106+
minitest (5.14.4)
107+
msgpack (1.4.2)
108+
nio4r (2.5.7)
109+
nokogiri (1.10.10)
112110
mini_portile2 (~> 2.4.0)
113-
public_suffix (4.0.3)
114-
puma (4.3.5)
111+
public_suffix (4.0.6)
112+
puma (4.3.7)
115113
nio4r (~> 2.0)
116114
rack (2.2.3)
117115
rack-test (1.1.0)
118116
rack (>= 1.0, < 3)
119-
rails (5.2.4.1)
120-
actioncable (= 5.2.4.1)
121-
actionmailer (= 5.2.4.1)
122-
actionpack (= 5.2.4.1)
123-
actionview (= 5.2.4.1)
124-
activejob (= 5.2.4.1)
125-
activemodel (= 5.2.4.1)
126-
activerecord (= 5.2.4.1)
127-
activestorage (= 5.2.4.1)
128-
activesupport (= 5.2.4.1)
117+
rails (5.2.5)
118+
actioncable (= 5.2.5)
119+
actionmailer (= 5.2.5)
120+
actionpack (= 5.2.5)
121+
actionview (= 5.2.5)
122+
activejob (= 5.2.5)
123+
activemodel (= 5.2.5)
124+
activerecord (= 5.2.5)
125+
activestorage (= 5.2.5)
126+
activesupport (= 5.2.5)
129127
bundler (>= 1.3.0)
130-
railties (= 5.2.4.1)
128+
railties (= 5.2.5)
131129
sprockets-rails (>= 2.0.0)
132130
rails-dom-testing (2.0.3)
133131
activesupport (>= 4.2.0)
134132
nokogiri (>= 1.6)
135133
rails-html-sanitizer (1.3.0)
136134
loofah (~> 2.3)
137-
railties (5.2.4.1)
138-
actionpack (= 5.2.4.1)
139-
activesupport (= 5.2.4.1)
135+
railties (5.2.5)
136+
actionpack (= 5.2.5)
137+
activesupport (= 5.2.5)
140138
method_source
141139
rake (>= 0.8.7)
142140
thor (>= 0.19.0, < 2.0)
143-
rake (13.0.1)
144-
rb-fsevent (0.10.3)
141+
rake (13.0.3)
142+
rb-fsevent (0.10.4)
145143
rb-inotify (0.10.1)
146144
ffi (~> 1.0)
147-
regexp_parser (1.6.0)
145+
regexp_parser (1.8.2)
148146
ruby_dep (1.5.0)
149-
rubyzip (2.2.0)
147+
rubyzip (2.3.0)
150148
sass (3.7.4)
151149
sass-listen (~> 4.0.0)
152150
sass-listen (4.0.0)
@@ -164,18 +162,18 @@ GEM
164162
sprockets (3.7.2)
165163
concurrent-ruby (~> 1.0)
166164
rack (> 1, < 3)
167-
sprockets-rails (3.2.1)
165+
sprockets-rails (3.2.2)
168166
actionpack (>= 4.0)
169167
activesupport (>= 4.0)
170168
sprockets (>= 3.0.0)
171169
sqlite3 (1.4.2)
172-
thor (1.0.1)
170+
thor (1.1.0)
173171
thread_safe (0.3.6)
174172
tilt (2.0.10)
175173
turbolinks (5.2.1)
176174
turbolinks-source (~> 5.2)
177175
turbolinks-source (5.2.0)
178-
tzinfo (1.2.6)
176+
tzinfo (1.2.9)
179177
thread_safe (~> 0.1)
180178
uglifier (4.2.0)
181179
execjs (>= 0.3.0, < 3)
@@ -184,7 +182,7 @@ GEM
184182
activemodel (>= 5.0)
185183
bindex (>= 0.4.0)
186184
railties (>= 5.0)
187-
websocket-driver (0.7.1)
185+
websocket-driver (0.7.3)
188186
websocket-extensions (>= 0.1.0)
189187
websocket-extensions (0.1.5)
190188
xpath (3.2.0)
@@ -213,4 +211,4 @@ DEPENDENCIES
213211
web-console (>= 3.3.0)
214212

215213
BUNDLED WITH
216-
2.1.2
214+
2.2.15

Diff for: spec/integration/rails_6.0.2.1/Gemfile.lock

+17-13
Original file line numberDiff line numberDiff line change
@@ -79,39 +79,43 @@ GEM
7979
regexp_parser (~> 1.5)
8080
xpath (~> 3.2)
8181
childprocess (3.0.0)
82-
concurrent-ruby (1.1.5)
82+
concurrent-ruby (1.1.8)
8383
crass (1.0.6)
84-
erubi (1.9.0)
84+
erubi (1.10.0)
8585
ffi (1.12.2)
8686
globalid (0.4.2)
8787
activesupport (>= 4.2.0)
88-
i18n (1.8.2)
88+
i18n (1.8.10)
8989
concurrent-ruby (~> 1.0)
9090
jbuilder (2.9.1)
9191
activesupport (>= 4.2.0)
9292
listen (3.1.5)
9393
rb-fsevent (~> 0.9, >= 0.9.4)
9494
rb-inotify (~> 0.9, >= 0.9.7)
9595
ruby_dep (~> 1.2)
96-
loofah (2.4.0)
96+
loofah (2.9.0)
9797
crass (~> 1.0.2)
9898
nokogiri (>= 1.5.9)
9999
mail (2.7.1)
100100
mini_mime (>= 0.1.1)
101101
marcel (0.3.3)
102102
mimemagic (~> 0.3.2)
103103
method_source (0.9.2)
104-
mimemagic (0.3.4)
104+
mimemagic (0.3.10)
105+
nokogiri (~> 1)
106+
rake
105107
mini_mime (1.0.2)
106-
mini_portile2 (2.4.0)
107-
minitest (5.14.0)
108+
mini_portile2 (2.5.0)
109+
minitest (5.14.4)
108110
msgpack (1.3.1)
109111
nio4r (2.5.2)
110-
nokogiri (1.10.8)
111-
mini_portile2 (~> 2.4.0)
112+
nokogiri (1.11.2)
113+
mini_portile2 (~> 2.5.0)
114+
racc (~> 1.4)
112115
public_suffix (4.0.3)
113116
puma (4.3.5)
114117
nio4r (~> 2.0)
118+
racc (1.5.2)
115119
rack (2.2.3)
116120
rack-test (1.1.0)
117121
rack (>= 1.0, < 3)
@@ -141,7 +145,7 @@ GEM
141145
method_source
142146
rake (>= 0.8.7)
143147
thor (>= 0.20.3, < 2.0)
144-
rake (13.0.1)
148+
rake (13.0.3)
145149
rb-fsevent (0.10.3)
146150
rb-inotify (0.10.1)
147151
ffi (~> 1.0)
@@ -161,7 +165,7 @@ GEM
161165
sqlite3 (1.4.2)
162166
thor (1.0.1)
163167
thread_safe (0.3.6)
164-
tzinfo (1.2.6)
168+
tzinfo (1.2.9)
165169
thread_safe (~> 0.1)
166170
web-console (4.0.1)
167171
actionview (>= 6.0.0)
@@ -177,7 +181,7 @@ GEM
177181
websocket-extensions (0.1.5)
178182
xpath (3.2.0)
179183
nokogiri (~> 1.8)
180-
zeitwerk (2.2.2)
184+
zeitwerk (2.4.2)
181185

182186
PLATFORMS
183187
ruby
@@ -198,4 +202,4 @@ DEPENDENCIES
198202
webdrivers
199203

200204
BUNDLED WITH
201-
2.1.2
205+
2.2.15

0 commit comments

Comments
 (0)