diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-06 22:38:35 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-06 22:38:35 +0100 |
commit | 7599009c2726bfdbd73da360961e4d8611641b02 (patch) | |
tree | 1578ea9216c4430e2d5d5043edc85f445716c28b /Gemfile | |
parent | c708931a327edcc70b92be7fcddb84fbbe2c0394 (diff) | |
parent | 83c3c19ce5eb6a88cd9ed428fa0f8d68d5fa7167 (diff) | |
download | gitlab-ce-7599009c2726bfdbd73da360961e4d8611641b02.tar.gz |
Merge remote-tracking branch 'origin/move-kubernetes-from-service-to-clusters-page-10-2-ver' into 35616-move-gke-form-1st-iteration
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -90,7 +90,7 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.6.1' # Files attachments -gem 'carrierwave', '~> 1.1' +gem 'carrierwave', '~> 1.2' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' @@ -281,7 +281,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta17' + gem 'prometheus-client-mmap', '~>0.7.0.beta18' gem 'raindrops', '~> 0.18' end @@ -324,9 +324,9 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.4' - gem 'capybara', '~> 2.15.0' + gem 'capybara', '~> 2.15' gem 'capybara-screenshot', '~> 1.0.0' - gem 'poltergeist', '~> 1.9.0' + gem 'selenium-webdriver', '~> 3.5' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' @@ -398,7 +398,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.48.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.51.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false |