projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4310-lock-before-fail' closes #4310 (again)
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 9b076eafe0bf41cc0f45b9f1c3536fb15e6327e0..ce79f854dea56e3006fe049ee52988c690839ded 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-35,18
+35,18
@@
GEM
addressable (2.3.6)
andand (1.3.3)
arel (3.0.3)
addressable (2.3.6)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.201409191
12741
)
+ arvados (0.1.201409191
04705
)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
- arvados-cli (0.1.2014
0919112741
)
+ arvados-cli (0.1.2014
1014201516
)
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)
+ arvados (~> 0.1
, >= 0.1
.0)
curb (~> 0.8)
curb (~> 0.8)
- google-api-client (~> 0.6.3)
+ google-api-client (~> 0.6
, >= 0.6
.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
oj (~> 2.0, >= 2.0.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
oj (~> 2.0, >= 2.0.3)
@@
-224,7
+224,7
@@
DEPENDENCIES
acts_as_api
andand
arvados (>= 0.1.20140919104705)
acts_as_api
andand
arvados (>= 0.1.20140919104705)
- arvados-cli (>= 0.1.2014
0919104705
)
+ arvados-cli (>= 0.1.2014
1014201516
)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails