Add latest changes from gitlab-org/gitlab@master

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