Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/changelog/committer.rb b/lib/gitlab/changelog/committer.rb
index 31661650eff..52c355478c5 100644
--- a/lib/gitlab/changelog/committer.rb
+++ b/lib/gitlab/changelog/committer.rb
@@ -55,7 +55,7 @@ module Gitlab
 
           result = service.execute
 
-          raise Error.new(result[:message]) if result[:status] != :success
+          raise Error, result[:message] if result[:status] != :success
         end
       end
 
diff --git a/lib/gitlab/changelog/parser.rb b/lib/gitlab/changelog/parser.rb
index a4c8da283cd..fac6fc19148 100644
--- a/lib/gitlab/changelog/parser.rb
+++ b/lib/gitlab/changelog/parser.rb
@@ -169,7 +169,7 @@ module Gitlab
         # We raise a custom error so it's easier to catch different changelog
         # related errors. In addition, this ensures the caller of this method
         # doesn't depend on a Parslet specific error class.
-        raise Error.new("Failed to parse the template: #{ex.message}")
+        raise Error, "Failed to parse the template: #{ex.message}"
       end
     end
   end