projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18318: Updates the nokogiri dependency on API & WB1.
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 992ff39c099a1c462e9fa3de7bd08a48990439f0..bdf791153446a7f56013edeaed00a04cb524646a 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-53,7
+53,7
@@
GEM
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
- addressable (2.
7
.0)
+ addressable (2.
8
.0)
public_suffix (>= 2.0.2, < 5.0)
andand (1.3.3)
arel (9.0.0)
public_suffix (>= 2.0.2, < 5.0)
andand (1.3.3)
arel (9.0.0)
@@
-80,8
+80,6
@@
GEM
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
- bootsnap (1.4.7)
- msgpack (~> 1.0)
builder (3.2.4)
byebug (11.0.1)
capistrano (2.15.9)
builder (3.2.4)
byebug (11.0.1)
capistrano (2.15.9)
@@
-112,7
+110,6
@@
GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
- hashie (3.6.0)
highline (2.0.1)
httpclient (2.8.3)
i18n (0.9.5)
highline (2.0.1)
httpclient (2.8.3)
i18n (0.9.5)
@@
-145,13
+142,11
@@
GEM
metaclass (0.0.4)
method_source (1.0.0)
mini_mime (1.1.0)
metaclass (0.0.4)
method_source (1.0.0)
mini_mime (1.1.0)
- mini_portile2 (2.
5.3
)
+ mini_portile2 (2.
6.1
)
minitest (5.10.3)
mocha (1.8.0)
metaclass (~> 0.0.1)
minitest (5.10.3)
mocha (1.8.0)
metaclass (~> 0.0.1)
- msgpack (1.3.3)
multi_json (1.15.0)
multi_json (1.15.0)
- multi_xml (0.6.0)
multipart-post (2.1.1)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
multipart-post (2.1.1)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
@@
-161,22
+156,10
@@
GEM
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
nio4r (2.5.7)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
nio4r (2.5.7)
- nokogiri (1.1
1.7
)
- mini_portile2 (~> 2.
5.0
)
+ nokogiri (1.1
2.5
)
+ mini_portile2 (~> 2.
6.1
)
racc (~> 1.4)
racc (~> 1.4)
- oauth2 (1.4.1)
- faraday (>= 0.8, < 0.16.0)
- jwt (>= 1.0, < 3.0)
- multi_json (~> 1.3)
- multi_xml (~> 0.5)
- rack (>= 1.2, < 3)
oj (3.9.2)
oj (3.9.2)
- omniauth (1.4.3)
- hashie (>= 1.2, < 4)
- rack (>= 1.6.2, < 3)
- omniauth-oauth2 (1.5.0)
- oauth2 (~> 1.1)
- omniauth (~> 1.2)
optimist (3.0.0)
os (1.1.1)
passenger (6.0.2)
optimist (3.0.0)
os (1.1.1)
passenger (6.0.2)
@@
-185,7
+168,7
@@
GEM
pg (1.1.4)
power_assert (1.1.4)
public_suffix (4.0.6)
pg (1.1.4)
power_assert (1.1.4)
public_suffix (4.0.6)
- racc (1.
5.2
)
+ racc (1.
6.0
)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
@@
-289,7
+272,6
@@
DEPENDENCIES
acts_as_api
andand
arvados (~> 2.1.5)
acts_as_api
andand
arvados (~> 2.1.5)
- bootsnap
byebug
factory_bot_rails
httpclient
byebug
factory_bot_rails
httpclient
@@
-301,8
+283,6
@@
DEPENDENCIES
mocha
multi_json
oj
mocha
multi_json
oj
- omniauth (~> 1.4.0)
- omniauth-oauth2 (~> 1.1)
optimist
passenger
pg (~> 1.0)
optimist
passenger
pg (~> 1.0)
@@
-325,4
+305,4
@@
DEPENDENCIES
uglifier (~> 2.0)
BUNDLED WITH
uglifier (~> 2.0)
BUNDLED WITH
- 1.17.3
+ 2.2.19