diff options
author | Kirill Zaitsev <kirik910@gmail.com> | 2014-09-15 11:10:35 +0400 |
---|---|---|
committer | Kirill Zaitsev <kirik910@gmail.com> | 2014-10-02 12:58:02 +0400 |
commit | 1c9d2e39c1aef8e10ebff6e57c174c197a3a1c93 (patch) | |
tree | 15d71443e6cf169c2f50d1f4798634ca8cb318c0 /app/models/merge_request.rb | |
parent | e2073f286e1eceb961795af5ea88a39b440e49ac (diff) | |
download | gitlab-ce-1c9d2e39c1aef8e10ebff6e57c174c197a3a1c93.tar.gz |
Hook attributes
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 4894c617674..e0358c1889c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -211,6 +211,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 |