Skip to content

Commit

Permalink
Merge pull request #102 from umass-gis/upgrade-v4.0.0
Browse files Browse the repository at this point in the history
Upgrade to v4.0.0
  • Loading branch information
rmseifried committed Apr 14, 2023
2 parents 4164914 + 8e97daa commit 647e5f5
Show file tree
Hide file tree
Showing 74 changed files with 1,263 additions and 556 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.0
3.2.0
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.0'
ruby '3.2.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem 'rails', '~> 6.1.3'
gem 'rails', '~> 7.0.4'
# Use MySQL as the database for Active Record
gem 'mysql2', '~> 0.5'
# Use Puma as the app server
gem 'puma', '~> 5.5'
gem 'puma', '~> 5.6'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
Expand Down Expand Up @@ -56,7 +56,7 @@ end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'blacklight', '~> 7.0'
gem 'geoblacklight', '~> 4.0.0.pre.alpha.3'
gem 'geoblacklight', '~> 4.0'
gem 'sprockets', '< 4.0'

group :development, :test do
Expand Down
Loading

0 comments on commit 647e5f5

Please sign in to comment.