diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-21 10:19:35 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-03-21 10:19:35 +0000 |
commit | aa2a97b545243f528f60fe74ed1c0374b920f97f (patch) | |
tree | 86c09eb9d0999ab1a0bd1bb81d8af49cbe9026a5 | |
parent | 8ff2d899dd5f960c6fd5fbf77794a702bd35eb9e (diff) | |
parent | 303618655433bbe61d85a52f7638377fcf529184 (diff) | |
download | gitlab-ce-aa2a97b545243f528f60fe74ed1c0374b920f97f.tar.gz |
Merge branch 'update-gettext_i18n_rails_js' into 'master'
Update gettext_i18n_rails_js 1.2.0 -> 1.3
See merge request gitlab-org/gitlab-ce!17801
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -268,7 +268,7 @@ gem 'premailer-rails', '~> 1.9.7' gem 'ruby_parser', '~> 3.8', require: false gem 'rails-i18n', '~> 4.0.9' gem 'gettext_i18n_rails', '~> 1.8.0' -gem 'gettext_i18n_rails_js', '~> 1.2.0' +gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 2c4984d494f..af7137e50c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,7 +211,7 @@ GEM faraday_middleware multi_json fast_blank (1.0.0) - fast_gettext (1.4.0) + fast_gettext (1.6.0) ffaker (2.4.0) ffi (1.9.18) flay (2.10.0) @@ -277,12 +277,12 @@ GEM gemojione (3.3.0) json get_process_mem (0.2.0) - gettext (3.2.2) + gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) gettext_i18n_rails (1.8.0) fast_gettext (>= 0.9.0) - gettext_i18n_rails_js (1.2.0) + gettext_i18n_rails_js (1.3.0) gettext (>= 3.0.2) gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) @@ -498,7 +498,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.0) - mini_mime (0.1.4) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -1055,7 +1055,7 @@ DEPENDENCIES gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) - gettext_i18n_rails_js (~> 1.2.0) + gettext_i18n_rails_js (~> 1.3) gitaly-proto (~> 0.88.0) github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) |