aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract/translation_test.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2016-08-09 23:53:54 +0200
committerGitHub <noreply@github.com>2016-08-09 23:53:54 +0200
commit7b31b06d4afd73734ac54cbbac105f0eab8d0d43 (patch)
tree94789c1c7f3c8e1c611a30548cd90ecbb34f98ea /actionpack/test/abstract/translation_test.rb
parent67d0c9ee93100dbdcafd20b0632e5bef6735888e (diff)
parentf006de5dc5a709f5dc8604ebd43f7741da30cd9f (diff)
downloadrails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.gz
rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.bz2
rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.zip
Merge pull request #26095 from kamipo/fix_broken_alignment_by_auto_correct
Fix broken alignments caused by auto-correct commit 411ccbd
Diffstat (limited to 'actionpack/test/abstract/translation_test.rb')
-rw-r--r--actionpack/test/abstract/translation_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb
index 1e17cb9777..0c4071df8d 100644
--- a/actionpack/test/abstract/translation_test.rb
+++ b/actionpack/test/abstract/translation_test.rb
@@ -9,7 +9,8 @@ module AbstractController
class TranslationControllerTest < ActiveSupport::TestCase
def setup
@controller = TranslationController.new
- I18n.backend.store_translations(:en, one: {
+ I18n.backend.store_translations(:en,
+ one: {
two: "bar",
},
abstract_controller: {