diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-08-10 02:46:51 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-10 02:46:51 +0900 |
commit | b031a9a4f44397cfeed1dd74524a44dfbd199be7 (patch) | |
tree | 3b5f6e9a81b54e8a18a12e7a9501cdb10effcd0c | |
parent | 3000c1490565b3a21376d6444cb6fe24dfe4e383 (diff) | |
parent | 6c09b3adc924f86422deefe4feeae01f5cfadc37 (diff) | |
download | rails-b031a9a4f44397cfeed1dd74524a44dfbd199be7.tar.gz rails-b031a9a4f44397cfeed1dd74524a44dfbd199be7.tar.bz2 rails-b031a9a4f44397cfeed1dd74524a44dfbd199be7.zip |
Merge pull request #33566 from yahonda/use_i18n_101
Avoid i18n 1.1.0 for now
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -47,6 +47,7 @@ gem "dalli" gem "listen", ">= 3.0.5", "< 3.2", require: false gem "libxml-ruby", platforms: :ruby gem "connection_pool", require: false +gem "i18n", "~> 1.0.1" # for railties app_generator_test gem "bootsnap", ">= 1.1.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 259221979e..87d017a8a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -534,6 +534,7 @@ DEPENDENCIES ffi (<= 1.9.21) google-cloud-storage (~> 1.11) hiredis + i18n (~> 1.0.1) image_processing (~> 1.2) json (>= 2.0.0) kindlerb (~> 1.2.0) |