Merge branch '11-8-stable-prepare-rc4' into '11-8-stable'

Prepare 11.8.0-rc4 release

See merge request gitlab-org/gitlab-ce!25206

5 files changed, 15 insertions, 5 deletions

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 815d5ca06d5..66e2ae6c25c 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.19.0
+1.19.1
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 2bf50aaf17a..56b6be4ebb2 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-8.3.0
+8.3.1
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 699b3e8555e..354e53a367c 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -36,7 +36,7 @@ module Ci
         project: project,
         current_user: current_user,
         push_options: params[:push_options],
-        **extra_options(**options))
+        **extra_options(options))
 
       sequence = Gitlab::Ci::Pipeline::Chain::Sequence
         .new(pipeline, command, SEQUENCE)
@@ -108,7 +108,12 @@ module Ci
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
-    def extra_options
+    def extra_options(options = {})
+      # In Ruby 2.4, even when options is empty, f(**options) doesn't work when f
+      # doesn't have any parameters. We reproduce the Ruby 2.5 behavior by
+      # checking explicitely that no arguments are given.
+      raise ArgumentError if options.any?
+
       {} # overriden in EE
     end
   end
diff --git a/changelogs/unreleased/57589-update-workhorse.yml b/changelogs/unreleased/57589-update-workhorse.yml
new file mode 100644
index 00000000000..525913bba4c
--- /dev/null
+++ b/changelogs/unreleased/57589-update-workhorse.yml
@@ -0,0 +1,5 @@
+---
+title: Update Workhorse to v8.3.1
+merge_request:
+author:
+type: other
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index 10ae8c7dedf..5c809f25fbd 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -11,7 +11,7 @@ description: 'Learn how to administer GitLab Pages.'
 > - This guide is for Omnibus GitLab installations. If you have installed
 >   GitLab from source, follow the [Pages source installation document](source.md).
 > - To learn how to use GitLab Pages, read the [user documentation][pages-userguide].
-> - Does NOT support subgroups. See [this issue](https://gitlab.com/gitlab-org/gitlab-ce/issues/30548) for more information and status.
+> - Support for subgroup project's websites was [introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/30548) in GitLab 11.8.
 
 This document describes how to set up the _latest_ GitLab Pages feature. Make
 sure to read the [changelog](#changelog) if you are upgrading to a new GitLab