Merge branch 'master' into 1786-replace-jekyll-with-zenweb

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 1dd00a0ee4ee7504de1049ef5bff7a6409713eac..59b16cc7eabb8029eac745d98d1acd6a64b7c9bf 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -1,6 +1,6 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem 'rails', '3.1.10'
+gem 'rails', '~> 3.2.0'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
@@ -17,8 +17,8 @@ gem 'oj'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '= 3.1.5'
-  gem 'coffee-rails', '~> 3.1.1'
+  gem 'sass-rails',   '>= 3.2.0'
+  gem 'coffee-rails', '~> 3.2.0'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'therubyracer'
@@ -48,3 +48,8 @@ gem 'passenger', :group => :production
 
 gem 'omniauth', '1.1.1'
 gem 'omniauth-oauth2', '1.1.1'
+
+gem 'andand'
+gem 'redis'
+
+gem 'test_after_commit', :group => :test