diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-04-24 22:37:49 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-04-24 22:37:49 -0500 |
| commit | 64aadef375a524f7b3041c6dccb75c1f9689069f (patch) | |
| tree | bde8ba90fdcf86c760a2fd7d685973fd64d134e4 /config | |
| parent | 77d9e3f9b49821af3ec9b4fbac574c75b02d0351 (diff) | |
| parent | 4f31d5963f44b1803fa54d0732cae86b0ec45e06 (diff) | |
| download | gitlab-ce-64aadef375a524f7b3041c6dccb75c1f9689069f.tar.gz | |
Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-page
Conflicts:
config/initializers/gettext_rails_i18n_patch.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/gettext_rails_i18n_patch.rb | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 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 c6b841aacd6..a50be2ea279 100644 --- a/config/initializers/gettext_rails_i18n_patch.rb +++ b/config/initializers/gettext_rails_i18n_patch.rb @@ -16,4 +16,3 @@ module GettextI18nRails end end end - diff --git a/config/webpack.config.js b/config/webpack.config.js index b6fe8c6f565..10df465faf6 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -34,6 +34,7 @@ var config = { group: './group.js', groups_list: './groups_list.js', issuable: './issuable/issuable_bundle.js', + locale: './locale/index.js', issue_show: './issue_show/index.js', locale: './locale/index.js', main: './main.js', |