Skip to content

Commit

Permalink
Merge pull request #380 from sul-dlss/corylown-patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne authored Mar 19, 2024
2 parents 51141af + f3cc133 commit e467fe2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ group :production do
gem 'mysql2'
end

gem 'blacklight', github: 'projectblacklight/blacklight'
gem 'arclight', github: 'projectblacklight/arclight'
gem 'blacklight', '~> 8.1'
gem 'arclight', '~> 1.1'
gem 'rsolr', '~> 2.0'
gem 'devise'
gem 'devise-guests', '~> 0.5'
Expand Down
42 changes: 16 additions & 26 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
GIT
remote: https://github.com/projectblacklight/arclight.git
revision: 54bfcb3b44afd98768bc24e131536e5ba968c15d
specs:
arclight (1.1.2)
blacklight (>= 8.0.0, < 9)
gretel
rails (~> 7.0)
traject (~> 3.0)
traject_plus (~> 2.0)

GIT
remote: https://github.com/projectblacklight/blacklight.git
revision: 6c6a72066a6330a815603e839b316958f6321dd7
specs:
blacklight (8.1.0)
globalid
i18n (>= 1.7.0)
jbuilder (~> 2.7)
kaminari (>= 0.15)
ostruct (>= 0.3.2)
rails (>= 6.1, < 8)
view_component (>= 2.66, < 4)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -101,10 +77,24 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
arclight (1.1.2)
blacklight (>= 8.0.0, < 9)
gretel
rails (~> 7.0)
traject (~> 3.0)
traject_plus (~> 2.0)
base64 (0.2.0)
bcrypt (3.1.20)
bigdecimal (3.1.7)
bindex (0.8.1)
blacklight (8.1.0)
globalid
i18n (>= 1.7.0)
jbuilder (~> 2.7)
kaminari (>= 0.15)
ostruct (>= 0.3.2)
rails (>= 6.1, < 8)
view_component (>= 2.66, < 4)
blacklight-locale_picker (1.1.0)
rails (>= 5.2.3, < 7.2)
bootsnap (1.18.3)
Expand Down Expand Up @@ -360,8 +350,8 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
arclight!
blacklight!
arclight (~> 1.1)
blacklight (~> 8.1)
blacklight-locale_picker
bootsnap
cssbundling-rails (~> 1.1)
Expand Down

0 comments on commit e467fe2

Please sign in to comment.