diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /config/initializers/gettext_rails_i18n_patch.rb | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'config/initializers/gettext_rails_i18n_patch.rb')
| -rw-r--r-- | config/initializers/gettext_rails_i18n_patch.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/gettext_rails_i18n_patch.rb b/config/initializers/gettext_rails_i18n_patch.rb index 714dd505824..09c9b325a04 100644 --- a/config/initializers/gettext_rails_i18n_patch.rb +++ b/config/initializers/gettext_rails_i18n_patch.rb @@ -45,7 +45,7 @@ module GettextI18nRailsJs private def gettext_messages_by_file - @gettext_messages_by_file ||= JSON.parse(load_messages) + @gettext_messages_by_file ||= Gitlab::Json.parse(load_messages) end def load_messages |