diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-01-03 22:25:51 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-01-03 22:25:51 +0100 |
commit | 4256d5a7beadd0cbcf81afcc1a0ea1d5ed30028b (patch) | |
tree | 24883f81d844f0ba5bef36f6c7397699943d975c /Gemfile | |
parent | 925b5b5b178a19552fa4137d22f8b69ce979990b (diff) | |
parent | fb583c4b1839af16c50e27105a300695aa50bcad (diff) | |
download | gitlab-ce-4256d5a7beadd0cbcf81afcc1a0ea1d5ed30028b.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-notes-index
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', '~> 3.0.0' # Supported DBs -gem 'mysql2', '~> 0.4.5', group: :mysql +gem 'mysql2', '~> 0.4.10', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.26.0' @@ -283,7 +283,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.7.0.beta43' + gem 'prometheus-client-mmap', '~> 0.7.0.beta44' gem 'raindrops', '~> 0.18' end @@ -402,7 +402,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.62.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.64.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false |