projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15305-keep-balance-bytes'
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index e80f87e2a570f1fb351a2e20b1936543fd7c960e..5ebdff0ca725e5f05aab1b496bec21165427666a 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-121,13
+121,13
@@
GEM
ffi (1.9.25)
globalid (0.4.2)
activesupport (>= 4.2.0)
ffi (1.9.25)
globalid (0.4.2)
activesupport (>= 4.2.0)
- googleauth (0.
10
.0)
+ googleauth (0.
9
.0)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
- signet (~> 0.
12
)
+ signet (~> 0.
7
)
hashie (3.6.0)
highline (2.0.1)
httpclient (2.8.3)
hashie (3.6.0)
highline (2.0.1)
httpclient (2.8.3)
@@
-254,7
+254,7
@@
GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- signet (0.1
2
.0)
+ signet (0.1
1
.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
@@
-324,6
+324,7
@@
DEPENDENCIES
rvm-capistrano
safe_yaml
sass-rails
rvm-capistrano
safe_yaml
sass-rails
+ signet (< 0.12)
simplecov (~> 0.7.1)
simplecov-rcov
sshkey
simplecov (~> 0.7.1)
simplecov-rcov
sshkey