Merge pull request #375 from pulibrary/rails_4_2_5

Rails 4.2.5, devise 3.5.4. Closes #374 and #373.
pulibrary · Jan 22, 2016 · 84331b9 · 84331b9
2 parents e1e7ca0 + 1e3f64d
commit 84331b9
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 108 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,11 +2,11 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.4'
+gem 'rails', '4.2.5'
 # Use postgresql as the database for Active Record
 gem 'pg'
 # Blacklight
-gem 'blacklight', ">= 5.3.0"
+gem 'blacklight', "<= 5.18.0"
 
 gem 'blacklight_folders'
 # slider limit support
@@ -50,7 +50,7 @@ gem 'faraday'
 gem 'yajl-ruby', require: 'yajl'
 
 gem "devise"
-gem "devise-guests", "~> 0.3"
+gem "devise-guests", '~> 0.5'
 gem "omniauth-cas"
 gem "blacklight-marc", "~> 5.0"
 gem "jettywrapper", "~> 1.7"