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 a54ddf479ec09524f9cd651baa64eae484fc4112..1dd00a0ee4ee7504de1049ef5bff7a6409713eac 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-8,7
+8,11
@@
gem 'rails', '3.1.10'
#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.
# Gems used only for assets and not required
# in production environments by default.
@@
-41,3
+45,6
@@
gem 'rvm-capistrano', :group => :test
gem 'acts_as_api'
gem 'passenger', :group => :production
gem 'acts_as_api'
gem 'passenger', :group => :production
+
+gem 'omniauth', '1.1.1'
+gem 'omniauth-oauth2', '1.1.1'