cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to canonical-rails from master, with rails 7.2.1+ compatibility

Browse source
This commit is contained in:
Andy Allan 2024-10-02 17:15:54 +01:00
parent 5720968323
commit 1633059dbb
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -118,7 +118,8 @@ gem "dalli"
gem "kgio" gem "kgio"
# Load canonical-rails to generate canonical URLs # Load canonical-rails to generate canonical URLs
gem "canonical-rails" # Use unreleased version for rails 7.2.1+ compatibility
gem "canonical-rails", :github => "jumph4x/canonical-rails", :ref => "fbc1c88c"
# Used to generate logstash friendly log files # Used to generate logstash friendly log files
gem "logstasher" gem "logstasher"

12
Gemfile.lock
View file

@ -1,3 +1,11 @@
GIT
remote: https://github.com/jumph4x/canonical-rails.git
revision: fbc1c88c71131ddb1352953cd6048033fd2473e5
ref: fbc1c88c
specs:
canonical-rails (0.2.15)
actionview (>= 4.1, < 7.3)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -137,8 +145,6 @@ GEM
bzip2-ffi (1.1.1) bzip2-ffi (1.1.1)
ffi (~> 1.0) ffi (~> 1.0)
cancancan (3.6.1) cancancan (3.6.1)
canonical-rails (0.2.15)
actionview (>= 4.1, <= 7.2)
capybara (3.40.0) capybara (3.40.0)
addressable addressable
matrix matrix
@ -629,7 +635,7 @@ DEPENDENCIES
browser (< 6) browser (< 6)
bzip2-ffi bzip2-ffi
cancancan cancancan
canonical-rails canonical-rails!
capybara (>= 2.15) capybara (>= 2.15)
config config
connection_pool connection_pool