projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add create method. refs #1406
[arvados.git]
/
Gemfile
diff --git
a/Gemfile
b/Gemfile
index fdd8f36e7ae0e89eca18ad900a69df1a7acda2a6..1dd00a0ee4ee7504de1049ef5bff7a6409713eac 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-1,6
+1,6
@@
source 'http://rubygems.org'
source 'http://rubygems.org'
-gem 'rails', '3.1.
5
'
+gem 'rails', '3.1.
10
'
# 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'
@@
-8,12
+8,16
@@
gem 'rails', '3.1.5'
#gem 'sqlite3'
gem 'pg'
#gem 'sqlite3'
gem 'pg'
-gem 'json'
+# Start using multi_json once we are on Rails 3.2;
+# Rails 3.1 has a dependency on multi_json < 1.3.0 but we need version 1.3.4 to
+# fix bug https://github.com/collectiveidea/json_spec/issues/27
+gem 'multi_json'
+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 'sass-rails', '
=
3.1.5'
gem 'coffee-rails', '~> 3.1.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'coffee-rails', '~> 3.1.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
@@
-37,3
+41,10
@@
gem 'jquery-rails'
# gem 'ruby-debug'
gem 'rvm-capistrano', :group => :test
# gem 'ruby-debug'
gem 'rvm-capistrano', :group => :test
+
+gem 'acts_as_api'
+
+gem 'passenger', :group => :production
+
+gem 'omniauth', '1.1.1'
+gem 'omniauth-oauth2', '1.1.1'