Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Switch to i18n master branch temporary to fix actionview test" #48394

Merged
merged 1 commit into from
Jun 5, 2023
+2 −13
Merged

Revert "Switch to i18n master branch temporary to fix actionview test" #48394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ gem "json", ">= 2.0.0"
# Workaround until Ruby ships with cgi version 0.3.6 or higher.
gem "cgi", ">= 0.3.6", require: false

# Workaround until a new version of i18n gem is released with
# https://github.com/ruby-i18n/i18n/commit/3115f71e0d21f449204b5bea5256232402252d04
gem "i18n", github: "ruby-i18n/i18n", branch: "master"

group :rubocop do
gem "rubocop", ">= 1.25.1", require: false
gem "rubocop-minitest", require: false
Expand Down
11 changes: 2 additions & 9 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ GIT
event_emitter
websocket

GIT
remote: https://github.com/ruby-i18n/i18n.git
revision: 5d5c40f0dd25c421b09bfc856352cd28fecc1516
branch: master
specs:
i18n (1.14.0)
concurrent-ruby (~> 1.0)

PATH
remote: .
specs:
Expand Down Expand Up @@ -273,6 +265,8 @@ GEM
signet (>= 0.16, < 2.a)
hashdiff (1.0.1)
httpclient (2.8.3)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
Expand Down Expand Up @@ -589,7 +583,6 @@ DEPENDENCIES
delayed_job_active_record
error_highlight (>= 0.4.0)
google-cloud-storage (~> 1.11)
i18n!
image_processing (~> 1.2)
importmap-rails
jbuilder
Expand Down