projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20472-priority-update' refs #20472
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 6335ef4af517fdebf409c9645807a81faa5fbc38..187d10bbbb5718520a5ba6ad5342aaa48b995fe7 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-94,7
+94,7
@@
GEM
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffi (1.9.25)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffi (1.9.25)
- globalid (1.
0
.0)
+ globalid (1.
1
.0)
activesupport (>= 5.0)
googleauth (0.9.0)
faraday (~> 0.12)
activesupport (>= 5.0)
googleauth (0.9.0)
faraday (~> 0.12)
@@
-217,7
+217,6
@@
GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
- sshkey (2.0.0)
test-unit (3.3.1)
power_assert
thor (1.2.1)
test-unit (3.3.1)
power_assert
thor (1.2.1)
@@
-242,6
+241,7
@@
DEPENDENCIES
listen
lograge
logstash-event
listen
lograge
logstash-event
+ mini_portile2 (~> 2.8, >= 2.8.1)
minitest (= 5.10.3)
mocha
multi_json
minitest (= 5.10.3)
mocha
multi_json
@@
-260,9
+260,8
@@
DEPENDENCIES
simplecov (~> 0.7.1)
simplecov-rcov
sprockets (~> 3.0)
simplecov (~> 0.7.1)
simplecov-rcov
sprockets (~> 3.0)
- sshkey
test-unit (~> 3.0)
themes_for_rails!
BUNDLED WITH
test-unit (~> 3.0)
themes_for_rails!
BUNDLED WITH
- 2.
2.19
+ 2.
3.26