From ddbb88010e05f6295dd6e46724d585494c8cc84a Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 16 Jun 2017 22:07:14 -0700 Subject: Replace PhantomJS with headless Chrome for Rspec tests Closes #30876 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 2c200f2fa7a..38599c1dabb 100644 --- a/Gemfile +++ b/Gemfile @@ -325,7 +325,7 @@ group :development, :test do gem 'capybara', '~> 2.6.2' gem 'capybara-screenshot', '~> 1.0.0' - gem 'poltergeist', '~> 1.9.0' + gem 'selenium-webdriver', '~> 2.53' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' -- cgit v1.2.1 From 0d6133b98ded73f6fe4c33e04473bb3f03015ea7 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 12 Aug 2017 21:32:03 -0700 Subject: Bump Capybara version for Chrome headless fixes --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 674f758f456..583d450ec32 100644 --- a/Gemfile +++ b/Gemfile @@ -331,7 +331,7 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.4' - gem 'capybara', '~> 2.6.2' + gem 'capybara', '~> 2.15' gem 'capybara-screenshot', '~> 1.0.0' gem 'selenium-webdriver', '~> 2.53' -- cgit v1.2.1 From ad73d24235ef22f9012b30be9d9492b11b46ca58 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 12 Aug 2017 22:34:01 -0700 Subject: Bump selenium-webdriver to 3.5.0 to make Capybara work properly --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 583d450ec32..29325611fba 100644 --- a/Gemfile +++ b/Gemfile @@ -333,7 +333,7 @@ group :development, :test do gem 'capybara', '~> 2.15' gem 'capybara-screenshot', '~> 1.0.0' - gem 'selenium-webdriver', '~> 2.53' + gem 'selenium-webdriver', '~> 3.5' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' -- cgit v1.2.1 From 46f6b75f82791463d703f7e2ab2a44b36d15de6f Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 10 Oct 2017 13:09:11 +0200 Subject: Use gitaly-proto 0.41.0 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 5645d1ea4ff..c1988aea803 100644 --- a/Gemfile +++ b/Gemfile @@ -398,7 +398,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.41.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false -- cgit v1.2.1 From 0aff29f96b54e8036fe46315adb45295bc6c9efd Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 10 Oct 2017 14:15:21 +0200 Subject: Merge Merge Requests via Gitaly --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index c1988aea803..6c9834d7d27 100644 --- a/Gemfile +++ b/Gemfile @@ -398,7 +398,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.41.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.42.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false -- cgit v1.2.1 From fa5eeaecfb85d428395ef76999c60f37cf185990 Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Fri, 13 Oct 2017 15:11:53 +0200 Subject: Migrate Gitlab::Git::Wiki#write_page to Gitaly Closes gitaly#638 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 6c9834d7d27..8c5c2ac739f 100644 --- a/Gemfile +++ b/Gemfile @@ -398,7 +398,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.42.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.45.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false -- cgit v1.2.1 From f9a4f184f303e881469d892ceea719c13ab7b768 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Wed, 11 Oct 2017 16:23:23 +0200 Subject: Update Prometheus gem to fix problems with other files overwriting current file --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index c1988aea803..80cbf87cd09 100644 --- a/Gemfile +++ b/Gemfile @@ -281,7 +281,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta14' + gem 'prometheus-client-mmap', '~>0.7.0.beta17' gem 'raindrops', '~> 0.18' end -- cgit v1.2.1 From c397bfe2df811cff8b3a5e66fb9e7cb1f36f6bc7 Mon Sep 17 00:00:00 2001 From: Paul B Date: Mon, 23 Oct 2017 00:58:59 +0200 Subject: The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: https://github.com/fog/fog-aliyun/commit/a7456ca6b63e5a0d88c849914679d2fa4707c10c Closes #39126 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 6859ea73e4f..f64cdca31c0 100644 --- a/Gemfile +++ b/Gemfile @@ -102,7 +102,7 @@ gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.1.0' +gem 'fog-aliyun', '~> 0.2.0' # for Google storage gem 'google-api-client', '~> 0.13.6' -- cgit v1.2.1 From 4969f486f26e614bb8fb69ed12ad1c14c4cfcd04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Mon, 23 Oct 2017 17:31:05 -0300 Subject: Support `Gitaly::User`'s gl_username field We also unify conversions from and to `Gitaly::User`s in the `Gitlab::Git::User` class. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f64cdca31c0..5adba4d58df 100644 --- a/Gemfile +++ b/Gemfile @@ -398,7 +398,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.45.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.48.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false -- cgit v1.2.1 From a718a59bf6fa81bbc51242267c56a4895629304c Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Sun, 29 Oct 2017 21:19:40 +0900 Subject: Bump carrierwave to 1.2.1 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 5adba4d58df..dd9146511b8 100644 --- a/Gemfile +++ b/Gemfile @@ -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' -- cgit v1.2.1 From ab64a7f21bd6944d9c4e5400ecdc4a6c854788fe Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Mon, 30 Oct 2017 13:20:28 +0100 Subject: Update Prometheus Gem to fix problem caused by reading bad data. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 5adba4d58df..8c9edf5c733 100644 --- a/Gemfile +++ b/Gemfile @@ -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 -- cgit v1.2.1 From b3a0166203e4b187de8956a14b40957f7d967e32 Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Tue, 31 Oct 2017 12:38:15 +0200 Subject: Migrate Gitlab::Git::Wiki#delete_page to Gitaly Closes gitaly#673 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 8c9edf5c733..f9719749bbc 100644 --- a/Gemfile +++ b/Gemfile @@ -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 -- cgit v1.2.1