Skip to content

Commit

Permalink
Merge branch 'release/2.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ewlarson committed May 7, 2021
2 parents 3b56088 + de2dee5 commit c3393cb
Show file tree
Hide file tree
Showing 43 changed files with 446 additions and 371 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.1
2.7.3
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,20 @@ group :development do
gem 'letter_opener'
end

gem 'blacklight', '~> 7.0.0'
gem 'blacklight', '7.9.0'
gem 'blacklight_advanced_search', git: 'https://github.com/projectblacklight/blacklight_advanced_search.git', :branch => 'master'
gem 'blacklight_range_limit', '~> 7.0.0'
gem 'chosen-rails' # jquery multiselect plugin for advanced search
gem 'bootstrap', '~> 4.0'
gem 'popper_js'
gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
gem 'geoblacklight', '~> 2.2.0'
gem 'geoblacklight', '3.3.0'

gem "rubyzip", ">= 1.3.0"
gem "awesome_print"

# Image migration
gem 'geoblacklight_sidecar_images', '~> 0.6.0'
gem 'geoblacklight_sidecar_images', '~> 0.7.0'
gem 'carrierwave', '~> 1.2'
gem 'mini_magick', '~> 4.9.4'

Expand Down
Loading

0 comments on commit c3393cb

Please sign in to comment.