Skip to content

Commit

Permalink
Merge branch 'release/4.13.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ewlarson committed Sep 5, 2023
2 parents efee480 + 9eb02b2 commit 62e7555
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ gem 'carrierwave', '~> 1.2'
gem 'mini_magick', '~> 4.9.4'

gem 'statesman', '~> 3.4.1'
gem 'sidekiq', '~> 6.3.0'
gem 'sidekiq', '~> 6.4'
gem 'sidekiq-failures', '~> 1.0.0'
gem 'down', '~> 4.4'
gem 'addressable', '~> 2.5.0'
Expand Down
15 changes: 6 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ GEM
puma (5.6.5)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.7)
rack (2.2.8)
rack-cors (2.0.1)
rack (>= 2.0.0)
rack-mini-profiler (2.3.4)
Expand Down Expand Up @@ -449,10 +449,7 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
rchardet (1.8.0)
redis (5.0.6)
redis-client (>= 0.9.0)
redis-client (0.14.1)
connection_pool
redis (4.8.1)
regexp_parser (2.8.1)
responders (3.1.0)
actionpack (>= 5.2)
Expand Down Expand Up @@ -514,10 +511,10 @@ GEM
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sidekiq (6.3.1)
connection_pool (>= 2.2.2)
sidekiq (6.5.9)
connection_pool (>= 2.2.5, < 3)
rack (~> 2.0)
redis (>= 4.2.0)
redis (>= 4.5.0, < 5)
sidekiq-failures (1.0.4)
sidekiq (>= 4.0.0)
sitemap_generator (6.0.2)
Expand Down Expand Up @@ -650,7 +647,7 @@ DEPENDENCIES
sass-rails (~> 5.0)
sd_notify (>= 0.1.0)
selenium-webdriver
sidekiq (~> 6.3.0)
sidekiq (~> 6.4)
sidekiq-failures (~> 1.0.0)
sitemap_generator (~> 6.0.2)
solr_wrapper!
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport

#### Release Version

B1G Geoportal Version v4.13.0 / GEOMG v0.16.0 / GeoBlacklight v4.1.0
B1G Geoportal Version v4.13.1 / GEOMG v0.16.0 / GeoBlacklight v4.1.0
3 changes: 3 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
get 'help', :to => redirect('https://sites.google.com/umn.edu/btaa-gdp/help')
get 'robots.:format' => 'robots#robots'

# Sidekiq - Uncomment and restart app to view sidekiq dashboard
# mount Sidekiq::Web => "/sidekiq"

# Feedback
mount PointlessFeedback::Engine, :at => '/feedback'

Expand Down

0 comments on commit 62e7555

Please sign in to comment.