summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 4894c617674..7c525b02f48 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -25,6 +25,7 @@ require Rails.root.join("lib/static_model")
class MergeRequest < ActiveRecord::Base
include Issuable
+ include Taskable
include InternalId
belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
@@ -211,6 +212,20 @@ class MergeRequest < ActiveRecord::Base
Gitlab::Satellite::MergeAction.new(current_user, self).format_patch
end
+ def hook_attrs
+ attrs = {
+ source: source_project.hook_attrs,
+ target: target_project.hook_attrs,
+ last_commit: nil
+ }
+
+ unless last_commit.nil?
+ attrs.merge!(last_commit: last_commit.hook_attrs(source_project))
+ end
+
+ attributes.merge!(attrs)
+ end
+
def for_fork?
target_project != source_project
end