diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-22 15:05:52 +0200 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-22 15:05:52 +0200 |
commit | 97c42df3b804a37e659c3cda6bd8a52570f31366 (patch) | |
tree | 97c38db7f71a93a7b0db5ca2c682d6d17479cbdb /Gemfile | |
parent | 3833f1dd84dfec844443a5b1d9ba2bd2b911c0bc (diff) | |
parent | 11716f310dcc495600f5a17e08456a1abb296482 (diff) | |
download | gitlab-ce-97c42df3b804a37e659c3cda6bd8a52570f31366.tar.gz |
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch28717-additional-metrics-review-branch
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -86,7 +86,7 @@ gem 'kaminari', '~> 0.17.0' gem 'hamlit', '~> 2.6.1' # Files attachments -gem 'carrierwave', '~> 1.0' +gem 'carrierwave', '~> 1.1' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' @@ -158,7 +158,7 @@ gem 'rufus-scheduler', '~> 3.4' gem 'httparty', '~> 0.13.3' # Colored output to console -gem 'rainbow', '~> 2.1.0' +gem 'rainbow', '~> 2.2' # GitLab settings gem 'settingslogic', '~> 2.0.9' @@ -260,6 +260,7 @@ gem 'premailer-rails', '~> 1.9.0' # I18n 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', '~> 3.2.2', require: false, group: :development @@ -373,7 +374,7 @@ gem 'ruby-prof', '~> 0.16.2' gem 'oauth2', '~> 1.4' # Soft deletion -gem 'paranoia', '~> 2.2' +gem 'paranoia', '~> 2.3.1' # Health check gem 'health_check', '~> 2.6.0' @@ -383,7 +384,7 @@ gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' # Gitaly GRPC client -gem 'gitaly', '~> 0.8.0' +gem 'gitaly', '~> 0.9.0' gem 'toml-rb', '~> 0.3.15', require: false |