projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3781: Merge branch 'master' into 3781-browser-upload
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index fa2ce5ae6966e2c63adafe24d024e509d52e07b1..a7da12263919f85a95c8dc713aa952d9b948fde5 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-6,6
+6,8
@@
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 'factory_girl_rails'
+ gem 'database_cleaner'
# Note: "require: false" here tells bunder not to automatically
# 'require' the packages during application startup. Installation is
# still mandatory.
# Note: "require: false" here tells bunder not to automatically
# 'require' the packages during application startup. Installation is
# still mandatory.
@@
-66,11
+68,11
@@
gem 'test_after_commit', :group => :test
gem 'google-api-client', '~> 0.6.3'
gem 'trollop'
gem 'faye-websocket'
gem 'google-api-client', '~> 0.6.3'
gem 'trollop'
gem 'faye-websocket'
-gem 'database_cleaner'
gem 'themes_for_rails'
gem 'themes_for_rails'
-gem 'arvados-cli', '>= 0.1.20140708213257'
+gem 'arvados', '>= 0.1.20140919104705'
+gem 'arvados-cli', '>= 0.1.20141202211726'
# pg_power lets us use partial indexes in schema.rb in Rails 3
gem 'pg_power'
# pg_power lets us use partial indexes in schema.rb in Rails 3
gem 'pg_power'