Include the changes in issuable webhook payloads

Signed-off-by: Rémy Coutable <remy@rymai.me>

7 files changed, 25 insertions, 17 deletions

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index fc30d008dea..e8a6c37d0b9 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -256,13 +256,19 @@ module Issuable
     participants(user).include?(user)
   end
 
-  def to_hook_data(user)
+  def to_hook_data(user, old_labels: [])
+    changes = previous_changes
+    if old_labels != labels
+      changes[:labels] = [old_labels.map(&:name), labels.map(&:name)]
+    end
+
     hook_data = {
       object_kind: self.class.name.underscore,
       user: user.hook_attrs,
       project: project.hook_attrs,
       object_attributes: hook_attrs,
       labels: labels.map(&:hook_attrs),
+      changes: changes,
       # DEPRECATED
       repository: project.hook_attrs.slice(:name, :url, :description, :homepage)
     }
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 155c5d972b7..058ee144ee4 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -78,6 +78,7 @@ class Issue < ActiveRecord::Base
     assignee_ids = self.assignee_ids
 
     attrs = {
+      url: Gitlab::UrlBuilder.build(self),
       total_time_spent: total_time_spent,
       human_total_time_spent: human_total_time_spent,
       human_time_estimate: human_time_estimate,
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 292122f779e..52a6c31503a 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -589,6 +589,7 @@ class MergeRequest < ActiveRecord::Base
 
   def hook_attrs
     attrs = {
+      url: Gitlab::UrlBuilder.build(self),
       source: source_project.try(:hook_attrs),
       target: target_project.hook_attrs,
       last_commit: nil,
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index f83ece7098f..1d6b48ccf56 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -255,7 +255,7 @@ class IssuableBaseService < BaseService
         invalidate_cache_counts(issuable, users: affected_assignees.compact)
         after_update(issuable)
         issuable.create_new_cross_references!(current_user)
-        execute_hooks(issuable, 'update')
+        execute_hooks(issuable, 'update', old_labels: old_labels)
 
         issuable.update_project_counter_caches if update_project_counters
       end
diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb
index 4c198fc96ea..f4fff4bf646 100644
--- a/app/services/issues/base_service.rb
+++ b/app/services/issues/base_service.rb
@@ -1,10 +1,10 @@
 module Issues
   class BaseService < ::IssuableBaseService
-    def hook_data(issue, action)
-      issue_data = issue.to_hook_data(current_user)
-      issue_url = Gitlab::UrlBuilder.build(issue)
-      issue_data[:object_attributes].merge!(url: issue_url, action: action)
-      issue_data
+    def hook_data(issue, action, old_labels: [])
+      hook_data = issue.to_hook_data(current_user, old_labels: old_labels)
+      hook_data[:object_attributes][:action] = action
+
+      hook_data
     end
 
     def reopen_service
@@ -22,8 +22,8 @@ module Issues
         issue, issue.project, current_user, old_assignees)
     end
 
-    def execute_hooks(issue, action = 'open')
-      issue_data  = hook_data(issue, action)
+    def execute_hooks(issue, action = 'open', old_labels: [])
+      issue_data  = hook_data(issue, action, old_labels: old_labels)
       hooks_scope = issue.confidential? ? :confidential_issue_hooks : :issue_hooks
       issue.project.execute_hooks(issue_data, hooks_scope)
       issue.project.execute_services(issue_data, hooks_scope)
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index 35ccff26262..7cdb45ca552 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -18,19 +18,19 @@ module MergeRequests
       super if changed_title
     end
 
-    def hook_data(merge_request, action, oldrev = nil)
-      hook_data = merge_request.to_hook_data(current_user)
-      hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request)
+    def hook_data(merge_request, action, old_rev: nil, old_labels: [])
+      hook_data = merge_request.to_hook_data(current_user, old_labels: old_labels)
       hook_data[:object_attributes][:action] = action
-      if oldrev && !Gitlab::Git.blank_ref?(oldrev)
-        hook_data[:object_attributes][:oldrev] = oldrev
+      if old_rev && !Gitlab::Git.blank_ref?(old_rev)
+        hook_data[:object_attributes][:oldrev] = old_rev
       end
+
       hook_data
     end
 
-    def execute_hooks(merge_request, action = 'open', oldrev = nil)
+    def execute_hooks(merge_request, action = 'open', old_rev: nil, old_labels: [])
       if merge_request.project
-        merge_data = hook_data(merge_request, action, oldrev)
+        merge_data = hook_data(merge_request, action, old_rev: old_rev, old_labels: old_labels)
         merge_request.project.execute_hooks(merge_data, :merge_request_hooks)
         merge_request.project.execute_services(merge_data, :merge_request_hooks)
       end
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index bc4a13cf4bc..fc100580c4f 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -166,7 +166,7 @@ module MergeRequests
     # Call merge request webhook with update branches
     def execute_mr_web_hooks
       merge_requests_for_source_branch.each do |merge_request|
-        execute_hooks(merge_request, 'update', @oldrev)
+        execute_hooks(merge_request, 'update', old_rev: @oldrev)
       end
     end