Merge accd5be into 80a909e

openstax · May 2, 2016 · fbdc064 · fbdc064
2 parents 80a909e + accd5be
commit fbdc064
Show file tree

Hide file tree

Showing 38 changed files with 220 additions and 182 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ gem 'bcrypt-ruby', '~> 3.0.0'
 
 gem 'rails', '3.2.22'
 
-gem 'doorkeeper', '~> 1.4.2'
+gem 'doorkeeper', '2.0.1'
 
 gem 'omniauth'
 gem 'omniauth-identity'
@@ -16,7 +16,9 @@ gem 'squeel'
 gem 'quiet_assets'
 
 gem 'openstax_utilities'
-gem 'openstax_api'
+# gem 'openstax_api', '6.1.3'
+gem 'openstax_api', github: 'openstax/openstax_api', branch: 'fix/rails-3.2'
+
 gem 'lev', '~> 2.2.0'
 
 gem 'jquery-rails'
@@ -32,7 +34,6 @@ gem 'jbuilder'
 gem 'delayed_job_active_record'
 
 gem 'representable', '~> 2.1.3'
-gem 'roar-rails'
 
 gem 'openstax_rescue_from', '~> 1.5.0'