projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16427: Merge branch 'master'
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 2097fa29e983866a0653b58916acde1fc1deaddc..9f3a5fb2b3d787e1a320d8dc3734126ac1ee33f4 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-157,7
+157,7
@@
GEM
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
nio4r (2.3.1)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
nio4r (2.3.1)
- nokogiri (1.10.
2
)
+ nokogiri (1.10.
8
)
mini_portile2 (~> 2.4.0)
oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0)
mini_portile2 (~> 2.4.0)
oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0)
@@
-180,7
+180,7
@@
GEM
pg (1.1.4)
power_assert (1.1.4)
public_suffix (4.0.3)
pg (1.1.4)
power_assert (1.1.4)
public_suffix (4.0.3)
- rack (2.
0.7
)
+ rack (2.
2.2
)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.7.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.7.2)
@@
-317,4
+317,4
@@
DEPENDENCIES
uglifier (~> 2.0)
BUNDLED WITH
uglifier (~> 2.0)
BUNDLED WITH
- 1.1
1
+ 1.1
6.6