summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-22 20:22:20 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-22 20:22:20 +0200
commit4b3afe2325e063943bdec123154a576f6a300bce (patch)
treec5d75c49d15cd08b4709ec5ac9499b7b4e131316 /app/models/merge_request.rb
parent94865a607b6189b29457d4afc02704c43e1ec0c2 (diff)
downloadgitlab-ce-4b3afe2325e063943bdec123154a576f6a300bce.tar.gz
Always create merge_request_diff if MR created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 076463f6c40..c53b24b817d 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -30,7 +30,9 @@ class MergeRequest < ActiveRecord::Base
belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
+
has_one :merge_request_diff, dependent: :destroy
+ after_create :create_merge_request_diff
delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil