diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-05-05 16:59:31 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-05-05 16:59:31 +0300 |
| commit | 5004579b15b0585c0a26231d7422fb1d8086bd66 (patch) | |
| tree | b9d0096b88813af0d2cb38c173485f56aa62ebc7 /config/application.rb | |
| parent | 79b8323d11cc06911b996f327c6e06fd29cafea4 (diff) | |
| parent | 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77 (diff) | |
| download | gitlab-ce-5004579b15b0585c0a26231d7422fb1d8086bd66.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip]
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index f2ecc4ce77c..32ad2393648 100644 --- a/config/application.rb +++ b/config/application.rb @@ -40,6 +40,9 @@ module Gitlab # config.i18n.default_locale = :de config.i18n.enforce_available_locales = false + # Translation for AR attrs is not working well for POROs like WikiPage + config.gettext_i18n_rails.use_for_active_record_attributes = false + # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" |