diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-04 10:28:46 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-04 10:28:46 +0300 |
| commit | a315e6025c702985b2f6390b29508de39383f52d (patch) | |
| tree | f0d07d955092e4a218346c41f2942131dfcef91a /config/initializers | |
| parent | 78dad4cf321eb84aa5decdea34704145adca0c3e (diff) | |
| parent | fd54a4678f23c9e18ce46b3803e5e57ffa1199a3 (diff) | |
Merge branch 'master' into zj-auto-devops-table
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/8_metrics.rb | 1 | ||||
| -rw-r--r-- | config/initializers/fast_gettext.rb | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index 370a976b64a..5b455a8065a 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -122,6 +122,7 @@ def instrument_classes(instrumentation) # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/36061 instrumentation.instrument_instance_method(MergeRequest, :ensure_ref_fetched) + instrumentation.instrument_instance_method(MergeRequest, :fetch_ref) end # rubocop:enable Metrics/AbcSize diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb index eb589ecdb52..fd0167aa476 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/fast_gettext.rb @@ -1,4 +1,7 @@ -FastGettext.add_text_domain 'gitlab', path: File.join(Rails.root, 'locale'), type: :po +FastGettext.add_text_domain 'gitlab', + path: File.join(Rails.root, 'locale'), + type: :po, + ignore_fuzzy: true FastGettext.default_text_domain = 'gitlab' FastGettext.default_available_locales = Gitlab::I18n.available_locales FastGettext.default_locale = :en |