summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-15 18:09:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-15 18:09:01 +0000
commit74804f8c31491045b62a4b9fed9f819531462ea2 (patch)
tree87c58fb3a34d871e37ed0320a124c5b64f815334 /bin
parent10130901f1128c91596c4cbfe14b1e5c9f15032f (diff)
downloadgitlab-ce-74804f8c31491045b62a4b9fed9f819531462ea2.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
-rwxr-xr-xbin/changelog2
-rwxr-xr-xbin/feature-flag2
2 files changed, 2 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