diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /bin | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/changelog | 2 | ||||
-rwxr-xr-x | bin/feature-flag | 2 | ||||
-rwxr-xr-x | bin/sidekiq-cluster | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/bin/changelog b/bin/changelog index bdf159a0a22..e796b1df600 100755 --- a/bin/changelog +++ b/bin/changelog @@ -71,7 +71,7 @@ class ChangelogOptionParser options.force = value end - opts.on('-m', '--merge-request [integer]', Integer, 'Merge Request ID') do |value| + opts.on('-m', '--merge-request [integer]', Integer, 'Merge request ID') do |value| options.merge_request = value end diff --git a/bin/feature-flag b/bin/feature-flag index 613ddc1d8cb..06387d12eb5 100755 --- a/bin/feature-flag +++ b/bin/feature-flag @@ -61,7 +61,7 @@ class FeatureFlagOptionParser options.force = value end - opts.on('-m', '--introduced-by-url [string]', String, 'URL of Merge Request introducing the Feature Flag') do |value| + opts.on('-m', '--introduced-by-url [string]', String, 'URL of merge request introducing the Feature Flag') do |value| options.introduced_by_url = value end diff --git a/bin/sidekiq-cluster b/bin/sidekiq-cluster index 2204a222b88..47f8e82d228 100755 --- a/bin/sidekiq-cluster +++ b/bin/sidekiq-cluster @@ -5,6 +5,7 @@ require 'optparse' require_relative '../lib/gitlab' require_relative '../lib/gitlab/utils' require_relative '../lib/gitlab/sidekiq_config/cli_methods' +require_relative '../lib/gitlab/sidekiq_config/worker_matcher' require_relative '../lib/gitlab/sidekiq_cluster' require_relative '../lib/gitlab/sidekiq_cluster/cli' |