diff --git a/Gemfile b/Gemfile index 7b7633b6..b2b1f9f3 100644 --- a/Gemfile +++ b/Gemfile @@ -66,8 +66,8 @@ group :production do end gem 'rubocop', '~> 0.41', '>= 0.41.2', require: false -gem 'blacklight', '6.7.3' -gem 'blacklight-spotlight', github: 'projectblacklight/spotlight', branch: :master +gem 'blacklight', '6.8.0' +gem 'blacklight-spotlight', github: 'projectblacklight/spotlight', branch: "master" gem 'solr_wrapper' gem 'rsolr', '~> 1.0.6' gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index 337d56d5..9a4c1fcb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GIT GIT remote: git://github.com/projectblacklight/spotlight.git - revision: 26afa29db984b1e3c2b2c5c431aef2083dff45be + revision: 8ffeaf7cdf7fe20dd95b3e384cfda0bf17c5c589 branch: master specs: blacklight-spotlight (0.34.1) @@ -125,7 +125,7 @@ GEM amq-protocol (2.0.1) arel (7.1.4) ast (2.3.0) - autoprefixer-rails (6.7.5) + autoprefixer-rails (6.7.6) execjs babel-source (5.8.35) babel-transpiler (0.7.0) @@ -134,7 +134,7 @@ GEM bcrypt (3.1.11) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - blacklight (6.7.3) + blacklight (6.8.0) bootstrap-sass (~> 3.2) deprecation globalid @@ -273,7 +273,7 @@ GEM thor (>= 0.14, < 2.0) jquery-tablesorter (1.20.8) railties (>= 3.2, < 6) - json (1.8.3) + json (1.8.6) jwt (1.5.6) kaminari (1.0.1) activesupport (>= 4.1.0) @@ -312,8 +312,8 @@ GEM nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) normalize-rails (3.0.3) - oauth2 (1.3.0) - faraday (>= 0.8, < 0.11) + oauth2 (1.3.1) + faraday (>= 0.8, < 0.12) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) @@ -563,7 +563,7 @@ PLATFORMS DEPENDENCIES almond-rails (~> 0.0.3) - blacklight (= 6.7.3) + blacklight (= 6.8.0) blacklight-gallery (>= 0.3.0) blacklight-oembed blacklight-spotlight!