Skip to content

Commit

Permalink
⬆️ Update Bulkrax and AllinsonFlex
Browse files Browse the repository at this point in the history
This commit will update the revisions of `Bulkrax` and `AllinsonFlex` to
the latest versions to bring in the views changes for the admin
dashboard sidebar.  Also, this commit moves the js require for Bulkrax
up above the jQuery requires to fix the issue with the admin jQuery
throwing errors.  This was likely due to a recent change to make Bulkrax
work better with Hydra.

Ref:
  - samvera/bulkrax#836
  - samvera-labs/allinson_flex#120
  - samvera/bulkrax#838
  • Loading branch information
kirkkwang committed Jul 21, 2023
1 parent 0ab2154 commit d2b2847
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ group :development do
# gem 'xray-rails' # when using this gem, know that sidekiq will not work
end

gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', ref: 'e6f2cf9'
gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', ref: 'a8f6c16'

gem 'allinson_flex', git: 'https://github.com/samvera-labs/allinson_flex.git'
gem 'blacklight', '~> 6.7'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/samvera-labs/allinson_flex.git
revision: f493853597c71334d436bbe57d62e1ee7f5ada74
revision: 2141b481e2f4a35b4df87c54edf6bc7c1611bfb0
specs:
allinson_flex (0.1.0)
json_schemer
Expand All @@ -10,8 +10,8 @@ GIT

GIT
remote: https://github.com/samvera-labs/bulkrax.git
revision: e6f2cf94730ea7db236a6f3280d3dc3967f5495e
ref: e6f2cf9
revision: a8f6c16b392a6ed1197cbeb90b82400b428d584b
ref: a8f6c16
specs:
bulkrax (5.2.1)
bagit (~> 0.4)
Expand Down
5 changes: 2 additions & 3 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
//= require codemirror
//= require codemirror-autorefresh
//= require codemirror/modes/css
//= require bulkrax/application
//= require jquery3
//= require jquery_ujs
//= require jquery.fontselect
Expand Down Expand Up @@ -40,13 +41,11 @@
//= require bootstrap_carousel
//= require bootstrap-datepicker

//= require bulkrax/application

//= require hyrax
//= require iiif_print

//= require jquery.flot.pie
//= require flot_graph
//= require statistics_tab_manager
//= require blacklight_gallery/default
//= require allinson_flex/application
//= require allinson_flex/application

0 comments on commit d2b2847

Please sign in to comment.