X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3c706ab8470e3c638126abd765d3295ed543aea5..50c2b24c280d66eb4e0ae9d0ead0133e2c6f9ff1:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index d8d49a1ce..229f68740 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "~> 7.0.0" +gem "rails", "~> 7.1.0" # Require json for multi_json gem "json" @@ -48,7 +48,6 @@ gem "active_record_union" gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_2_3" gem "bootstrap_form", "~> 5.0" gem "cancancan" -gem "composite_primary_keys", "~> 14.0.0" gem "config" gem "delayed_job_active_record" gem "frozen_record" @@ -114,7 +113,7 @@ gem "kgio" gem "secure_headers" # Load canonical-rails to generate canonical URLs -gem "canonical-rails" +gem "canonical-rails", :github => "tomhughes/canonical-rails", :branch => "rails71" # Used to generate logstash friendly log files gem "logstasher"