Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
annotate
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
annotate
Commits
80fbfa55
Unverified
Commit
80fbfa55
authored
Jun 12, 2021
by
ocarta-l
Committed by
GitHub
Jun 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ci: conflicts with removed gems (#865)
parent
e075a214
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
83 additions
and
81 deletions
+83
-81
Gemfile.lock
spec/integration/rails_5.2.4.1/Gemfile.lock
+66
-68
Gemfile.lock
spec/integration/rails_6.0.2.1/Gemfile.lock
+17
-13
No files found.
spec/integration/rails_5.2.4.1/Gemfile.lock
View file @
80fbfa55
...
@@ -8,43 +8,43 @@ PATH
...
@@ -8,43 +8,43 @@ PATH
GEM
GEM
remote: https://rubygems.org/
remote: https://rubygems.org/
specs:
specs:
actioncable (5.2.
4.1
)
actioncable (5.2.
5
)
actionpack (= 5.2.
4.1
)
actionpack (= 5.2.
5
)
nio4r (~> 2.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
websocket-driver (>= 0.6.1)
actionmailer (5.2.
4.1
)
actionmailer (5.2.
5
)
actionpack (= 5.2.
4.1
)
actionpack (= 5.2.
5
)
actionview (= 5.2.
4.1
)
actionview (= 5.2.
5
)
activejob (= 5.2.
4.1
)
activejob (= 5.2.
5
)
mail (~> 2.5, >= 2.5.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
rails-dom-testing (~> 2.0)
actionpack (5.2.
4.1
)
actionpack (5.2.
5
)
actionview (= 5.2.
4.1
)
actionview (= 5.2.
5
)
activesupport (= 5.2.
4.1
)
activesupport (= 5.2.
5
)
rack (~> 2.0, >= 2.0.8)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.
4.1
)
actionview (5.2.
5
)
activesupport (= 5.2.
4.1
)
activesupport (= 5.2.
5
)
builder (~> 3.1)
builder (~> 3.1)
erubi (~> 1.4)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.
4.1
)
activejob (5.2.
5
)
activesupport (= 5.2.
4.1
)
activesupport (= 5.2.
5
)
globalid (>= 0.3.6)
globalid (>= 0.3.6)
activemodel (5.2.
4.1
)
activemodel (5.2.
5
)
activesupport (= 5.2.
4.1
)
activesupport (= 5.2.
5
)
activerecord (5.2.
4.1
)
activerecord (5.2.
5
)
activemodel (= 5.2.
4.1
)
activemodel (= 5.2.
5
)
activesupport (= 5.2.
4.1
)
activesupport (= 5.2.
5
)
arel (>= 9.0)
arel (>= 9.0)
activestorage (5.2.
4.1
)
activestorage (5.2.
5
)
actionpack (= 5.2.
4.1
)
actionpack (= 5.2.
5
)
activerecord (= 5.2.
4.1
)
activerecord (= 5.2.
5
)
marcel (~>
0.3.1
)
marcel (~>
1.0.0
)
activesupport (5.2.
4.1
)
activesupport (5.2.
5
)
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
minitest (~> 5.1)
...
@@ -55,11 +55,11 @@ GEM
...
@@ -55,11 +55,11 @@ GEM
io-like (~> 0.3.0)
io-like (~> 0.3.0)
arel (9.0.0)
arel (9.0.0)
bindex (0.8.1)
bindex (0.8.1)
bootsnap (1.
4.5
)
bootsnap (1.
7.3
)
msgpack (~> 1.0)
msgpack (~> 1.0)
builder (3.2.4)
builder (3.2.4)
byebug (11.1.
1
)
byebug (11.1.
3
)
capybara (3.3
1.0
)
capybara (3.3
2.2
)
addressable
addressable
mini_mime (>= 0.1.3)
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
nokogiri (~> 1.8)
...
@@ -78,75 +78,73 @@ GEM
...
@@ -78,75 +78,73 @@ GEM
coffee-script-source
coffee-script-source
execjs
execjs
coffee-script-source (1.12.2)
coffee-script-source (1.12.2)
concurrent-ruby (1.1.
5
)
concurrent-ruby (1.1.
8
)
crass (1.0.6)
crass (1.0.6)
erubi (1.
9
.0)
erubi (1.
10
.0)
execjs (2.7.0)
execjs (2.7.0)
ffi (1.1
2.2
)
ffi (1.1
5.0
)
globalid (0.4.2)
globalid (0.4.2)
activesupport (>= 4.2.0)
activesupport (>= 4.2.0)
i18n (1.8.
2
)
i18n (1.8.
10
)
concurrent-ruby (~> 1.0)
concurrent-ruby (~> 1.0)
io-like (0.3.
0
)
io-like (0.3.
1
)
jbuilder (2.
9.1
)
jbuilder (2.
11.2
)
activesupport (>=
4.2
.0)
activesupport (>=
5.0
.0)
listen (3.1.5)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
ruby_dep (~> 1.2)
loofah (2.
4
.0)
loofah (2.
9
.0)
crass (~> 1.0.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.7.1)
mini_mime (>= 0.1.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
marcel (1.0.1)
mimemagic (~> 0.3.2)
method_source (1.0.0)
method_source (0.9.2)
mini_mime (1.0.3)
mimemagic (0.3.4)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_portile2 (2.4.0)
minitest (5.14.
0
)
minitest (5.14.
4
)
msgpack (1.
3
.2)
msgpack (1.
4
.2)
nio4r (2.5.
2
)
nio4r (2.5.
7
)
nokogiri (1.10.
8
)
nokogiri (1.10.
10
)
mini_portile2 (~> 2.4.0)
mini_portile2 (~> 2.4.0)
public_suffix (4.0.
3
)
public_suffix (4.0.
6
)
puma (4.3.
5
)
puma (4.3.
7
)
nio4r (~> 2.0)
nio4r (~> 2.0)
rack (2.2.3)
rack (2.2.3)
rack-test (1.1.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack (>= 1.0, < 3)
rails (5.2.
4.1
)
rails (5.2.
5
)
actioncable (= 5.2.
4.1
)
actioncable (= 5.2.
5
)
actionmailer (= 5.2.
4.1
)
actionmailer (= 5.2.
5
)
actionpack (= 5.2.
4.1
)
actionpack (= 5.2.
5
)
actionview (= 5.2.
4.1
)
actionview (= 5.2.
5
)
activejob (= 5.2.
4.1
)
activejob (= 5.2.
5
)
activemodel (= 5.2.
4.1
)
activemodel (= 5.2.
5
)
activerecord (= 5.2.
4.1
)
activerecord (= 5.2.
5
)
activestorage (= 5.2.
4.1
)
activestorage (= 5.2.
5
)
activesupport (= 5.2.
4.1
)
activesupport (= 5.2.
5
)
bundler (>= 1.3.0)
bundler (>= 1.3.0)
railties (= 5.2.
4.1
)
railties (= 5.2.
5
)
sprockets-rails (>= 2.0.0)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
loofah (~> 2.3)
railties (5.2.
4.1
)
railties (5.2.
5
)
actionpack (= 5.2.
4.1
)
actionpack (= 5.2.
5
)
activesupport (= 5.2.
4.1
)
activesupport (= 5.2.
5
)
method_source
method_source
rake (>= 0.8.7)
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
thor (>= 0.19.0, < 2.0)
rake (13.0.
1
)
rake (13.0.
3
)
rb-fsevent (0.10.
3
)
rb-fsevent (0.10.
4
)
rb-inotify (0.10.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
ffi (~> 1.0)
regexp_parser (1.
6.0
)
regexp_parser (1.
8.2
)
ruby_dep (1.5.0)
ruby_dep (1.5.0)
rubyzip (2.
2
.0)
rubyzip (2.
3
.0)
sass (3.7.4)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
sass-listen (4.0.0)
...
@@ -164,18 +162,18 @@ GEM
...
@@ -164,18 +162,18 @@ GEM
sprockets (3.7.2)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
rack (> 1, < 3)
sprockets-rails (3.2.
1
)
sprockets-rails (3.2.
2
)
actionpack (>= 4.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
sqlite3 (1.4.2)
thor (1.
0.1
)
thor (1.
1.0
)
thread_safe (0.3.6)
thread_safe (0.3.6)
tilt (2.0.10)
tilt (2.0.10)
turbolinks (5.2.1)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
turbolinks-source (5.2.0)
tzinfo (1.2.
6
)
tzinfo (1.2.
9
)
thread_safe (~> 0.1)
thread_safe (~> 0.1)
uglifier (4.2.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
execjs (>= 0.3.0, < 3)
...
@@ -184,7 +182,7 @@ GEM
...
@@ -184,7 +182,7 @@ GEM
activemodel (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
bindex (>= 0.4.0)
railties (>= 5.0)
railties (>= 5.0)
websocket-driver (0.7.
1
)
websocket-driver (0.7.
3
)
websocket-extensions (>= 0.1.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
websocket-extensions (0.1.5)
xpath (3.2.0)
xpath (3.2.0)
...
@@ -213,4 +211,4 @@ DEPENDENCIES
...
@@ -213,4 +211,4 @@ DEPENDENCIES
web-console (>= 3.3.0)
web-console (>= 3.3.0)
BUNDLED WITH
BUNDLED WITH
2.
1.2
2.
2.15
spec/integration/rails_6.0.2.1/Gemfile.lock
View file @
80fbfa55
...
@@ -79,13 +79,13 @@ GEM
...
@@ -79,13 +79,13 @@ GEM
regexp_parser (~> 1.5)
regexp_parser (~> 1.5)
xpath (~> 3.2)
xpath (~> 3.2)
childprocess (3.0.0)
childprocess (3.0.0)
concurrent-ruby (1.1.
5
)
concurrent-ruby (1.1.
8
)
crass (1.0.6)
crass (1.0.6)
erubi (1.
9
.0)
erubi (1.
10
.0)
ffi (1.12.2)
ffi (1.12.2)
globalid (0.4.2)
globalid (0.4.2)
activesupport (>= 4.2.0)
activesupport (>= 4.2.0)
i18n (1.8.
2
)
i18n (1.8.
10
)
concurrent-ruby (~> 1.0)
concurrent-ruby (~> 1.0)
jbuilder (2.9.1)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
activesupport (>= 4.2.0)
...
@@ -93,7 +93,7 @@ GEM
...
@@ -93,7 +93,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
ruby_dep (~> 1.2)
loofah (2.
4
.0)
loofah (2.
9
.0)
crass (~> 1.0.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.7.1)
...
@@ -101,17 +101,21 @@ GEM
...
@@ -101,17 +101,21 @@ GEM
marcel (0.3.3)
marcel (0.3.3)
mimemagic (~> 0.3.2)
mimemagic (~> 0.3.2)
method_source (0.9.2)
method_source (0.9.2)
mimemagic (0.3.4)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.0.2)
mini_mime (1.0.2)
mini_portile2 (2.
4
.0)
mini_portile2 (2.
5
.0)
minitest (5.14.
0
)
minitest (5.14.
4
)
msgpack (1.3.1)
msgpack (1.3.1)
nio4r (2.5.2)
nio4r (2.5.2)
nokogiri (1.10.8)
nokogiri (1.11.2)
mini_portile2 (~> 2.4.0)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
public_suffix (4.0.3)
public_suffix (4.0.3)
puma (4.3.5)
puma (4.3.5)
nio4r (~> 2.0)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
rack (2.2.3)
rack-test (1.1.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack (>= 1.0, < 3)
...
@@ -141,7 +145,7 @@ GEM
...
@@ -141,7 +145,7 @@ GEM
method_source
method_source
rake (>= 0.8.7)
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
thor (>= 0.20.3, < 2.0)
rake (13.0.
1
)
rake (13.0.
3
)
rb-fsevent (0.10.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
ffi (~> 1.0)
...
@@ -161,7 +165,7 @@ GEM
...
@@ -161,7 +165,7 @@ GEM
sqlite3 (1.4.2)
sqlite3 (1.4.2)
thor (1.0.1)
thor (1.0.1)
thread_safe (0.3.6)
thread_safe (0.3.6)
tzinfo (1.2.
6
)
tzinfo (1.2.
9
)
thread_safe (~> 0.1)
thread_safe (~> 0.1)
web-console (4.0.1)
web-console (4.0.1)
actionview (>= 6.0.0)
actionview (>= 6.0.0)
...
@@ -177,7 +181,7 @@ GEM
...
@@ -177,7 +181,7 @@ GEM
websocket-extensions (0.1.5)
websocket-extensions (0.1.5)
xpath (3.2.0)
xpath (3.2.0)
nokogiri (~> 1.8)
nokogiri (~> 1.8)
zeitwerk (2.
2
.2)
zeitwerk (2.
4
.2)
PLATFORMS
PLATFORMS
ruby
ruby
...
@@ -198,4 +202,4 @@ DEPENDENCIES
...
@@ -198,4 +202,4 @@ DEPENDENCIES
webdrivers
webdrivers
BUNDLED WITH
BUNDLED WITH
2.
1.2
2.
2.15
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
