projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1911-python-sdk-pydoc'
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index f11141149f7e3ec5f6d1d039523d5ac3d31e0c4d..59b16cc7eabb8029eac745d98d1acd6a64b7c9bf 100644
(file)
--- a/
services/api/Gemfile
+++ b/
services/api/Gemfile
@@
-1,6
+1,6
@@
-source 'http://rubygems.org'
+source 'http
s
://rubygems.org'
-gem 'rails', '
3.1.1
0'
+gem 'rails', '
~> 3.2.
0'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
# 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
# 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'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer'
@@
-51,3
+51,5
@@
gem 'omniauth-oauth2', '1.1.1'
gem 'andand'
gem 'redis'
gem 'andand'
gem 'redis'
+
+gem 'test_after_commit', :group => :test