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

Revert "Bump rails-i18n from 4.0.2 to 6.0.0"

Browse source 
This reverts commit a6d8043dc2.
This commit is contained in:
Tom Hughes 2020-06-28 19:21:24 +01:00
parent 45c599b1b0
commit c7076ef2a0
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -54,7 +54,7 @@ gem "i18n-js", ">= 3.0.0"
gem "oauth-plugin", ">= 0.5.1" gem "oauth-plugin", ">= 0.5.1"
gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
gem "rack-cors" gem "rack-cors"
gem "rails-i18n", "~> 6.0.0" gem "rails-i18n", "~> 4.0.0"
gem "rinku", ">= 2.0.6", :require => "rails_rinku" gem "rinku", ">= 2.0.6", :require => "rails_rinku"
gem "strong_migrations" gem "strong_migrations"
gem "validates_email_format_of", ">= 1.5.1" gem "validates_email_format_of", ">= 1.5.1"

10
Gemfile.lock
View file

@ -220,7 +220,7 @@ GEM
html_tokenizer (0.0.7) html_tokenizer (0.0.7)
htmlentities (4.3.4) htmlentities (4.3.4)
http_accept_language (2.1.1) http_accept_language (2.1.1)
i18n (1.8.3) i18n (0.9.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n-js (3.7.0) i18n-js (3.7.0)
i18n (>= 0.6.6) i18n (>= 0.6.6)
@ -365,9 +365,9 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.3) loofah (~> 2.3)
rails-i18n (6.0.0) rails-i18n (4.0.2)
i18n (>= 0.7, < 2) i18n (~> 0.6)
railties (>= 6.0.0, < 7) rails (>= 4.0)
railties (6.0.3.2) railties (6.0.3.2)
actionpack (= 6.0.3.2) actionpack (= 6.0.3.2)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.2)
@ -534,7 +534,7 @@ DEPENDENCIES
rack-uri_sanitizer rack-uri_sanitizer
rails (= 6.0.3.2) rails (= 6.0.3.2)
rails-controller-testing rails-controller-testing
rails-i18n (~> 6.0.0) rails-i18n (~> 4.0.0)
rinku (>= 2.0.6) rinku (>= 2.0.6)
rotp rotp
rubocop rubocop