Skip to content

Commit

Permalink
Merge branch 'master' into radar/customise-hash-deep-symbolize-keys
Browse files Browse the repository at this point in the history
* master:
  Bump to 1.3.0
  Rails master now only works with Ruby 2.5+
  Update post install message
  • Loading branch information
radar committed Dec 20, 2018
2 parents 38732a6 + 30e2559 commit 60f0830
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ matrix:
- rvm: 2.1.10
gemfile: gemfiles/Gemfile.rails-5.2.x

# Rails 6+ requires Ruby >= 2.4
# Rails 6+ requires Ruby >= 2.5
- rvm: 2.1.10
gemfile: gemfiles/Gemfile.rails-master
- rvm: 2.2.8
gemfile: gemfiles/Gemfile.rails-master
- rvm: 2.3.7
gemfile: gemfiles/Gemfile.rails-master
- rvm: 2.4.5
gemfile: gemfiles/Gemfile.rails-master
allow_failures:
- rvm: rbx
- rvm: jruby
Expand Down
2 changes: 1 addition & 1 deletion i18n.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ HEADS UP! i18n 1.1 changed fallbacks to exclude default locale.
But that may break your application.
Please check your Rails app for 'config.i18n.fallbacks = true'.
If you're using I18n 1.1.x and Rails (< 6.0), this should be
If you're using I18n (>= 1.1.0) and Rails (< 5.2.2), this should be
'config.i18n.fallbacks = [I18n.default_locale]'.
If not, fallbacks will be broken in your app by I18n 1.1.x.
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module I18n
VERSION = "1.2.0"
VERSION = "1.3.0"
end

0 comments on commit 60f0830

Please sign in to comment.