projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2991-job-docker-images' refs #2991
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index b0f85124a07b1010a940f19c9cbcc744fb8de485..38f738fc0e30ac9cce5beaf0fa0d9cfcfbdd182c 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-60,7
+60,6
@@
gem 'omniauth', '1.1.1'
gem 'omniauth-oauth2', '1.1.1'
gem 'andand'
gem 'omniauth-oauth2', '1.1.1'
gem 'andand'
-gem 'redis'
gem 'test_after_commit', :group => :test
gem 'test_after_commit', :group => :test
@@
-71,7
+70,9
@@
gem 'database_cleaner'
gem 'themes_for_rails'
gem 'themes_for_rails'
-gem 'arvados-cli', '>= 0.1.20140
328152103
'
+gem 'arvados-cli', '>= 0.1.20140
703214022
'
# 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'
+
+gem 'puma'