From 546ddc3f6ac96fdf09934390a938bb391d07dc94 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 3 Apr 2020 12:09:52 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/services/audit_event_service.rb                   | 10 +++++++++-
 app/services/groups/deploy_tokens/create_service.rb   |  2 +-
 app/services/projects/deploy_tokens/create_service.rb |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'app/services')

diff --git a/app/services/audit_event_service.rb b/app/services/audit_event_service.rb
index 42ed5f17d8d..d9e40c456aa 100644
--- a/app/services/audit_event_service.rb
+++ b/app/services/audit_event_service.rb
@@ -13,7 +13,7 @@ class AuditEventService
   #
   # @return [AuditEventService]
   def initialize(author, entity, details = {})
-    @author = author
+    @author = build_author(author)
     @entity = entity
     @details = details
   end
@@ -49,6 +49,14 @@ class AuditEventService
 
   private
 
+  def build_author(author)
+    if author.is_a?(User)
+      author
+    else
+      Gitlab::Audit::UnauthenticatedAuthor.new(name: author)
+    end
+  end
+
   def base_payload
     {
       author_id: @author.id,
diff --git a/app/services/groups/deploy_tokens/create_service.rb b/app/services/groups/deploy_tokens/create_service.rb
index d747dabcd3c..81f761eb61d 100644
--- a/app/services/groups/deploy_tokens/create_service.rb
+++ b/app/services/groups/deploy_tokens/create_service.rb
@@ -9,7 +9,7 @@ module Groups
         deploy_token = create_deploy_token_for(@group, params)
 
         if deploy_token.persisted?
-          success(deploy_token: deploy_token, http_status: :ok)
+          success(deploy_token: deploy_token, http_status: :created)
         else
           error(deploy_token.errors.full_messages.to_sentence, :bad_request)
         end
diff --git a/app/services/projects/deploy_tokens/create_service.rb b/app/services/projects/deploy_tokens/create_service.rb
index e943b2489ac..2e71650b066 100644
--- a/app/services/projects/deploy_tokens/create_service.rb
+++ b/app/services/projects/deploy_tokens/create_service.rb
@@ -9,7 +9,7 @@ module Projects
         deploy_token = create_deploy_token_for(@project, params)
 
         if deploy_token.persisted?
-          success(deploy_token: deploy_token, http_status: :ok)
+          success(deploy_token: deploy_token, http_status: :created)
         else
           error(deploy_token.errors.full_messages.to_sentence, :bad_request)
         end
-- 
cgit v1.2.3