try to get rails 6 working

TuftsUniversity · Oct 30, 2023 · c1b80a2 · c1b80a2
1 parent 47051bc
commit c1b80a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -19,7 +19,9 @@ gem 'sass-rails'
 gem 'uglifier'
 
 # changed blacklight version
-gem 'blacklight', '7.24.0'
+# gem 'blacklight', '7.24.0'
+# temp for rails 6
+gem 'blacklight', '7.14.0'
 gem 'blacklight_range_limit'
 
 # removed pinned verision of '~> 0.4.10'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -92,17 +92,17 @@ GEM
       rubocop-performance
       rubocop-rails
       rubocop-rspec
-    blacklight (7.24.0)
+    blacklight (7.14.0)
       deprecation
       globalid
       i18n (>= 1.7.0)
       jbuilder (~> 2.7)
       kaminari (>= 0.15)
       ostruct (>= 0.3.2)
-      rails (>= 5.1, < 7.1)
-      view_component (~> 2.43)
-    blacklight_range_limit (8.2.2)
-      blacklight (>= 7.22.2, < 9)
+      rails (>= 5.1, < 7)
+      view_component (>= 2.23.0)
+    blacklight_range_limit (8.1.0)
+      blacklight (~> 7.0)
     bootstrap (4.6.2)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.16.1, < 2)
@@ -585,7 +585,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     unicode-types (1.9.0)
-    view_component (2.82.0)
+    view_component (3.6.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -607,7 +607,7 @@ DEPENDENCIES
   active-fedora (= 14.0.0)
   active_fedora-noid
   bixby
-  blacklight (= 7.24.0)
+  blacklight (= 7.14.0)
   blacklight_range_limit
   bootstrap (~> 4.0)
   byebug