summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 14:16:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 14:16:34 +0000
commit4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (patch)
tree2b256ff8dfe63dafe7f42b0d995f9e74fd1dc48b /bin
parentbd860c22f6a4b9473cbddd34a53eead8235a7ea1 (diff)
downloadgitlab-ce-4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
-rwxr-xr-xbin/changelog9
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/changelog b/bin/changelog
index ec068d06507..45b6295e331 100755
--- a/bin/changelog
+++ b/bin/changelog
@@ -15,7 +15,8 @@ Options = Struct.new(
:force,
:merge_request,
:title,
- :type
+ :type,
+ :ee
)
INVALID_TYPE = -1
@@ -85,6 +86,10 @@ class ChangelogOptionParser
options.type = parse_type(value)
end
+ opts.on('-e', '--ee', 'Generate a changelog entry for GitLab EE') do |value|
+ options.ee = value
+ end
+
opts.on('-h', '--help', 'Print help message') do
$stdout.puts opts
raise Done.new
@@ -249,7 +254,7 @@ class ChangelogEntry
end
def ee?
- @ee ||= File.exist?(File.expand_path('../CHANGELOG-EE.md', __dir__))
+ options.ee
end
def branch_name