From 81dd4363f3ed78009acb94aff0da48fafe2afd93 Mon Sep 17 00:00:00 2001 From: Ben Pennell Date: Thu, 12 Oct 2023 15:35:54 -0400 Subject: [PATCH 1/2] Use branch of blacklight 7.34.0 which has a fix for the advanced search start over button --- Gemfile | 1 + Gemfile.lock | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index da4423789..22ab1f7ab 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,7 @@ git_source(:github) do |repo_name| end gem 'active-fedora', '~> 14.0' +gem 'blacklight', git: 'https://github.com/UNC-Libraries/blacklight.git', branch: 'advanced_start_over' gem 'blacklight_advanced_search', '~> 8.0.0.alpha2' gem 'blacklight_oai_provider', '7.0.2' gem 'blacklight_range_limit', '~> 8.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9c99b79bb..60b6a13c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,19 @@ +GIT + remote: https://github.com/UNC-Libraries/blacklight.git + revision: 8b344aa9273d307b3fe93e3915ce5d762e53a28f + branch: advanced_start_over + specs: + blacklight (7.34.0) + deprecation + globalid + hashdiff + i18n (>= 1.7.0) + jbuilder (~> 2.7) + kaminari (>= 0.15) + ostruct (>= 0.3.2) + rails (>= 5.1, < 7.1) + view_component (>= 2.66, < 4) + GIT remote: https://github.com/UNC-Libraries/bulkrax.git revision: ccbc380e1a51543017b9ddab5cd5d03f46fd293d @@ -202,16 +218,6 @@ GEM i18n bcrypt (3.1.19) bindex (0.8.1) - blacklight (7.33.1) - deprecation - globalid - hashdiff - i18n (>= 1.7.0) - jbuilder (~> 2.7) - kaminari (>= 0.15) - ostruct (>= 0.3.2) - rails (>= 5.1, < 7.1) - view_component (~> 2.66) blacklight-access_controls (6.0.1) blacklight (> 6.0, < 8) cancancan (>= 1.8) @@ -1076,6 +1082,7 @@ PLATFORMS DEPENDENCIES active-fedora (~> 14.0) + blacklight! blacklight_advanced_search (~> 8.0.0.alpha2) blacklight_oai_provider (= 7.0.2) blacklight_range_limit (~> 8.3.0) From 7872633e904e0cdad1e84e63fc44ca60c8b9c475 Mon Sep 17 00:00:00 2001 From: Ben Pennell Date: Thu, 12 Oct 2023 16:59:12 -0400 Subject: [PATCH 2/2] Update to newer ref --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 60b6a13c7..7ac25b202 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/UNC-Libraries/blacklight.git - revision: 8b344aa9273d307b3fe93e3915ce5d762e53a28f + revision: a68a03f3871aeb49ec897b9007122c0ad033e4e6 branch: advanced_start_over specs: blacklight (7.34.0)