projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2755: fix merge conflicts (refs #2755)
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index e50802ef9920585c00574691eda90b68b230df13..b0f85124a07b1010a940f19c9cbcc744fb8de485 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-6,7
+6,11
@@
gem 'rails', '~> 3.2.0'
# gem 'rails', :git => 'git://github.com/rails/rails.git'
group :test, :development do
# gem 'rails', :git => 'git://github.com/rails/rails.git'
group :test, :development do
- gem 'sqlite3'
+ # Note: "require: false" here tells bunder not to automatically
+ # 'require' the packages during application startup. Installation is
+ # still mandatory.
+ gem 'simplecov', '~> 0.7.1', require: false
+ gem 'simplecov-rcov', require: false
end
# This might not be needed in :test and :development, but we load it
end
# This might not be needed in :test and :development, but we load it
@@
-62,7
+66,12
@@
gem 'test_after_commit', :group => :test
gem 'google-api-client', '~> 0.6.3'
gem 'trollop'
gem 'google-api-client', '~> 0.6.3'
gem 'trollop'
+gem 'faye-websocket'
+gem 'database_cleaner'
gem 'themes_for_rails'
gem 'arvados-cli', '>= 0.1.20140328152103'
gem 'themes_for_rails'
gem 'arvados-cli', '>= 0.1.20140328152103'
+
+# pg_power lets us use partial indexes in schema.rb in Rails 3
+gem 'pg_power'