projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2640-folder-api' into 1970-folder-view
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 7a516d5725c30c349797966e658e66be0925aadd..a09f950636adbdbcc8a030235ff6234422451fac 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-69,11
+69,16
@@
GEM
coffee-script-source (1.7.0)
curb (0.8.5)
daemon_controller (1.2.0)
coffee-script-source (1.7.0)
curb (0.8.5)
daemon_controller (1.2.0)
+ database_cleaner (1.2.0)
erubis (2.7.0)
erubis (2.7.0)
+ eventmachine (1.0.3)
execjs (2.0.2)
extlib (0.9.16)
faraday (0.8.9)
multipart-post (~> 1.2.0)
execjs (2.0.2)
extlib (0.9.16)
faraday (0.8.9)
multipart-post (~> 1.2.0)
+ faye-websocket (0.7.2)
+ eventmachine (>= 0.12.0)
+ websocket-driver (>= 0.3.1)
google-api-client (0.6.4)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
google-api-client (0.6.4)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
@@
-130,6
+135,9
@@
GEM
rack
rake (>= 0.8.1)
pg (0.17.1)
rack
rake (>= 0.8.1)
pg (0.17.1)
+ pg_power (1.6.4)
+ pg
+ rails (~> 3.1)
polyglot (0.3.4)
rack (1.4.5)
rack-cache (1.2)
polyglot (0.3.4)
rack (1.4.5)
rack-cache (1.2)
@@
-193,6
+201,7
@@
GEM
execjs (>= 0.3.0)
json (>= 1.8.0)
uuidtools (2.1.4)
execjs (>= 0.3.0)
json (>= 1.8.0)
uuidtools (2.1.4)
+ websocket-driver (0.3.2)
PLATFORMS
ruby
PLATFORMS
ruby
@@
-202,6
+211,8
@@
DEPENDENCIES
andand
arvados-cli (>= 0.1.20140328152103)
coffee-rails (~> 3.2.0)
andand
arvados-cli (>= 0.1.20140328152103)
coffee-rails (~> 3.2.0)
+ database_cleaner
+ faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
multi_json
google-api-client (~> 0.6.3)
jquery-rails
multi_json
@@
-210,6
+221,7
@@
DEPENDENCIES
omniauth-oauth2 (= 1.1.1)
passenger
pg
omniauth-oauth2 (= 1.1.1)
passenger
pg
+ pg_power
rails (~> 3.2.0)
redis
rvm-capistrano
rails (~> 3.2.0)
redis
rvm-capistrano