projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2525-java-sdk
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index c87acc61b187f1762ebdb8906e109bd74bb29073..d574644644aa1c94dfab216d982d78bc637d7b2c 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-69,6
+69,7
@@
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)
eventmachine (1.0.3)
execjs (2.0.2)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
@@
-134,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)
@@
-174,12
+178,17
@@
GEM
faraday (~> 0.8.1)
jwt (>= 0.1.5)
multi_json (>= 1.0.0)
faraday (~> 0.8.1)
jwt (>= 0.1.5)
multi_json (>= 1.0.0)
+ simplecov (0.7.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
+ simplecov-rcov (0.2.3)
+ simplecov (>= 0.4.1)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.9)
test_after_commit (0.2.3)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
test_after_commit (0.2.3)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
@@
-207,6
+216,7
@@
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
faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
@@
-216,11
+226,13
@@
DEPENDENCIES
omniauth-oauth2 (= 1.1.1)
passenger
pg
omniauth-oauth2 (= 1.1.1)
passenger
pg
+ pg_power
rails (~> 3.2.0)
redis
rvm-capistrano
sass-rails (>= 3.2.0)
rails (~> 3.2.0)
redis
rvm-capistrano
sass-rails (>= 3.2.0)
- sqlite3
+ simplecov (~> 0.7.1)
+ simplecov-rcov
test_after_commit
themes_for_rails
therubyracer
test_after_commit
themes_for_rails
therubyracer