Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-page
Conflicts: config/webpack.config.js
Showing
... | ... | @@ -256,6 +256,7 @@ gem 'premailer-rails', '~> 1.9.0' |
# I18n | ||
gem 'gettext_i18n_rails', '~> 1.8.0' | ||
gem 'gettext_i18n_rails_js', '~> 1.2.0' | ||
gem 'gettext', '~> 3.2.2', require: false, group: :development | ||
# Metrics | ||
... | ... |
... | ... | @@ -26,7 +26,9 @@ |
"dropzone": "^4.2.0", | ||
"emoji-unicode-version": "^0.2.1", | ||
"eslint-plugin-html": "^2.0.1", | ||
"exports-loader": "^0.6.4", | ||
"file-loader": "^0.11.1", | ||
"jed": "^1.1.1", | ||
"jquery": "^2.2.1", | ||
"jquery-ujs": "^1.2.1", | ||
"js-cookie": "^2.1.3", | ||
... | ... |
Please register or sign in to comment