Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 3 deletions

diff --git a/app/services/tags/create_service.rb b/app/services/tags/create_service.rb
index 4de6b2d2774..8a7b98ab944 100644
--- a/app/services/tags/create_service.rb
+++ b/app/services/tags/create_service.rb
@@ -4,7 +4,7 @@ module Tags
   class CreateService < BaseService
     def execute(tag_name, target, message)
       valid_tag = Gitlab::GitRefValidator.validate(tag_name)
-      return error('Tag name invalid') unless valid_tag
+      return error('Tag name invalid', 400) unless valid_tag
 
       repository = project.repository
       message = message&.strip
@@ -14,7 +14,7 @@ module Tags
       begin
         new_tag = repository.add_tag(current_user, tag_name, target, message)
       rescue Gitlab::Git::Repository::TagExistsError
-        return error("Tag #{tag_name} already exists")
+        return error("Tag #{tag_name} already exists", 409)
       rescue Gitlab::Git::PreReceiveError => ex
         return error(ex.message)
       end
@@ -24,7 +24,7 @@ module Tags
 
         success.merge(tag: new_tag)
       else
-        error("Target #{target} is invalid")
+        error("Target #{target} is invalid", 400)
       end
     end
   end