projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3168: Instead of crashing using save! log an error and go to the next job.
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 18fce168191a762672c379fe184153a60a5641b7..bb327d05576d7374d51647ffb066785000087276 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-35,13
+35,13
@@
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.20140
812162850
)
+ arvados (0.1.20140
919104705
)
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.20140
812162850
)
+ arvados-cli (0.1.20140
919104705
)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1.0)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1.0)
@@
-76,6
+76,11
@@
GEM
eventmachine (1.0.3)
execjs (2.0.2)
extlib (0.9.16)
eventmachine (1.0.3)
execjs (2.0.2)
extlib (0.9.16)
+ factory_girl (4.4.0)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (4.4.1)
+ factory_girl (~> 4.4.0)
+ railties (>= 3.0.0)
faraday (0.8.9)
multipart-post (~> 1.2.0)
faye-websocket (0.7.2)
faraday (0.8.9)
multipart-post (~> 1.2.0)
faye-websocket (0.7.2)
@@
-125,7
+130,7
@@
GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
- oj (2.10.
0
)
+ oj (2.10.
2
)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth (1.1.1)
hashie (~> 1.2)
rack
@@
-218,9
+223,11
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados-cli (>= 0.1.20140708213257)
+ arvados (>= 0.1.20140919104705)
+ arvados-cli (>= 0.1.20140919104705)
coffee-rails (~> 3.2.0)
database_cleaner
coffee-rails (~> 3.2.0)
database_cleaner
+ factory_girl_rails
faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
faye-websocket
google-api-client (~> 0.6.3)
jquery-rails