Add latest changes from gitlab-org/gitlab@master

2 files changed, 41 insertions, 28 deletions

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/snippets/create_service.rb b/app/services/snippets/create_service.rb
index 389d4819c68..0b74bd77e28 100644
--- a/app/services/snippets/create_service.rb
+++ b/app/services/snippets/create_service.rb
@@ -9,72 +9,77 @@ module Snippets
     def execute
       filter_spam_check_params
 
-      snippet = if project
-                  project.snippets.build(params)
-                else
-                  PersonalSnippet.new(params)
-                end
+      @snippet = if project
+                   project.snippets.build(params)
+                 else
+                   PersonalSnippet.new(params)
+                 end
 
-      unless Gitlab::VisibilityLevel.allowed_for?(current_user, snippet.visibility_level)
-        deny_visibility_level(snippet)
+      unless Gitlab::VisibilityLevel.allowed_for?(current_user, @snippet.visibility_level)
+        deny_visibility_level(@snippet)
 
-        return snippet_error_response(snippet, 403)
+        return snippet_error_response(@snippet, 403)
       end
 
-      snippet.author = current_user
+      @snippet.author = current_user
 
-      spam_check(snippet, current_user)
+      spam_check(@snippet, current_user)
 
-      if save_and_commit(snippet)
-        UserAgentDetailService.new(snippet, @request).create
+      if save_and_commit
+        UserAgentDetailService.new(@snippet, @request).create
         Gitlab::UsageDataCounters::SnippetCounter.count(:create)
 
-        ServiceResponse.success(payload: { snippet: snippet } )
+        ServiceResponse.success(payload: { snippet: @snippet } )
       else
-        snippet_error_response(snippet, 400)
+        snippet_error_response(@snippet, 400)
       end
     end
 
     private
 
-    def save_and_commit(snippet)
-      snippet_saved = snippet.with_transaction_returning_status do
-        snippet.save && snippet.store_mentions!
+    def save_and_commit
+      snippet_saved = @snippet.with_transaction_returning_status do
+        @snippet.save && @snippet.store_mentions!
       end
 
       if snippet_saved && Feature.enabled?(:version_snippets, current_user)
-        create_repository_for(snippet)
-        create_commit(snippet)
+        create_repository
+        create_commit
       end
 
       snippet_saved
     rescue => e # Rescuing all because we can receive Creation exceptions, GRPC exceptions, Git exceptions, ...
-      snippet.errors.add(:base, e.message)
       log_error(e.message)
 
       # If the commit action failed we need to remove the repository if exists
-      snippet.repository.remove if snippet.repository_exists?
+      @snippet.repository.remove if @snippet.repository_exists?
 
       # If the snippet was created, we need to remove it as we
       # would do like if it had had any validation error
-      snippet.delete if snippet.persisted?
+      # and reassign a dupe so we don't return the deleted snippet
+      if @snippet.persisted?
+        @snippet.delete
+        @snippet = @snippet.dup
+      end
+
+      @snippet.errors.add(:base, e.message)
 
       false
     end
 
-    def create_repository_for(snippet)
-      snippet.create_repository
+    def create_repository
+      @snippet.create_repository
 
-      raise CreateRepositoryError, 'Repository could not be created' unless snippet.repository_exists?
+      raise CreateRepositoryError, 'Repository could not be created' unless @snippet.repository_exists?
     end
 
-    def create_commit(snippet)
+    def create_commit
       commit_attrs = {
         branch_name: 'master',
         message: 'Initial commit'
       }
 
-      snippet.snippet_repository.multi_files_action(current_user, snippet_files, commit_attrs)
+      @snippet.snippet_repository.multi_files_action(current_user, snippet_files, commit_attrs)
     end
 
     def snippet_files