diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 13:37:19 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 13:37:19 +0300 |
commit | 03b44916ba08ac766bb6763882be5704dca5b4ea (patch) | |
tree | 4decccab9407271d1971f28aee7b201a83637cc7 /app/models/merge_request.rb | |
parent | 1c077cac8a70ada8eda4a099d5bee92950eeda5d (diff) | |
parent | 1c9d2e39c1aef8e10ebff6e57c174c197a3a1c93 (diff) | |
download | gitlab-ce-03b44916ba08ac766bb6763882be5704dca5b4ea.tar.gz |
Merge pull request #7754 from Bugagazavr/hooks
More information in merge request hook
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 |