projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2449-keep-write-blocks
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index c734ab560b17b6517125cb5118c1904afd958d3b..e6fcbde95a5909f32188f2eb89492d7e92d0fe35 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-35,9
+35,15
@@
GEM
addressable (2.3.5)
andand (1.3.3)
arel (3.0.2)
addressable (2.3.5)
andand (1.3.3)
arel (3.0.2)
- arvados-cli (0.1.20140311162926)
+ arvados (0.1.20140411162938)
+ activesupport (>= 3.2.13)
+ andand
+ google-api-client (~> 0.6.3)
+ json (>= 1.7.7)
+ arvados-cli (0.1.20140411162938)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
+ arvados (~> 0.1.0)
curb (~> 0.8)
google-api-client (~> 0.6.3)
json (~> 1.7, >= 1.7.7)
curb (~> 0.8)
google-api-client (~> 0.6.3)
json (~> 1.7, >= 1.7.7)
@@
-61,7
+67,6
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
coffee-script-source
execjs
coffee-script-source (1.6.3)
- curb (0.8.5)
daemon_controller (1.1.7)
erubis (2.7.0)
execjs (2.0.2)
daemon_controller (1.1.7)
erubis (2.7.0)
execjs (2.0.2)
@@
-192,7
+197,7
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados-cli (>= 0.1.201403
11162926
)
+ arvados-cli (>= 0.1.201403
28152103
)
coffee-rails (~> 3.2.0)
google-api-client (~> 0.6.3)
jquery-rails
coffee-rails (~> 3.2.0)
google-api-client (~> 0.6.3)
jquery-rails