Add latest changes from gitlab-org/gitlab@master

1 files changed, 37 insertions, 1 deletions

diff --git a/app/services/resource_events/change_state_service.rb b/app/services/resource_events/change_state_service.rb
index 8beb76d8aee..202972c1efd 100644
--- a/app/services/resource_events/change_state_service.rb
+++ b/app/services/resource_events/change_state_service.rb
@@ -8,12 +8,18 @@ module ResourceEvents
       @user, @resource = user, resource
     end
 
-    def execute(state)
+    def execute(params)
+      @params = params
+
       ResourceStateEvent.create(
         user: user,
         issue: issue,
         merge_request: merge_request,
+        source_commit: commit_id_of(mentionable_source),
+        source_merge_request_id: merge_request_id_of(mentionable_source),
         state: ResourceStateEvent.states[state],
+        close_after_error_tracking_resolve: close_after_error_tracking_resolve,
+        close_auto_resolve_prometheus_alert: close_auto_resolve_prometheus_alert,
         created_at: Time.zone.now)
 
       resource.expire_note_etag_cache
@@ -21,6 +27,36 @@ module ResourceEvents
 
     private
 
+    attr_reader :params
+
+    def close_auto_resolve_prometheus_alert
+      params[:close_auto_resolve_prometheus_alert] || false
+    end
+
+    def close_after_error_tracking_resolve
+      params[:close_after_error_tracking_resolve] || false
+    end
+
+    def state
+      params[:status]
+    end
+
+    def mentionable_source
+      params[:mentionable_source]
+    end
+
+    def commit_id_of(mentionable_source)
+      return unless mentionable_source.is_a?(Commit)
+
+      mentionable_source.id[0...40]
+    end
+
+    def merge_request_id_of(mentionable_source)
+      return unless mentionable_source.is_a?(MergeRequest)
+
+      mentionable_source.id
+    end
+
     def issue
       return unless resource.is_a?(Issue)