projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3686-sharing-repositories
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index c2b2351543525bea174b429e8981078023937614..6db1cb443b9793718597cd5fc330e764ea39cfbc 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-41,7
+41,7
@@
GEM
google-api-client (~> 0.6.3, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
google-api-client (~> 0.6.3, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
- arvados-cli (0.1.201
41209151444
)
+ arvados-cli (0.1.201
50121183928
)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.0)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.0)
@@
-174,6
+174,7
@@
GEM
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
+ ruby-prof (0.15.2)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
sass (3.3.4)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
sass (3.3.4)
@@
-224,7
+225,7
@@
DEPENDENCIES
acts_as_api
andand
arvados (>= 0.1.20140919104705)
acts_as_api
andand
arvados (>= 0.1.20140919104705)
- arvados-cli (>= 0.1.201
41202211726
)
+ arvados-cli (>= 0.1.201
50121183928
)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
@@
-240,6
+241,7
@@
DEPENDENCIES
pg_power
puma
rails (~> 3.2.0)
pg_power
puma
rails (~> 3.2.0)
+ ruby-prof
rvm-capistrano
sass-rails (>= 3.2.0)
simplecov (~> 0.7.1)
rvm-capistrano
sass-rails (>= 3.2.0)
simplecov (~> 0.7.1)