Commit 4b3afe2325e063943bdec123154a576f6a300bce
1 parent
94865a60
Exists in
spb-stable
and in
3 other branches
Always create merge_request_diff if MR created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
4 changed files
with
2 additions
and
3 deletions
Show diff stats
app/controllers/projects/merge_requests_controller.rb
| ... | ... | @@ -76,7 +76,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController |
| 76 | 76 | @merge_request.author = current_user |
| 77 | 77 | @target_branches ||= [] |
| 78 | 78 | if @merge_request.save |
| 79 | - @merge_request.reload_code | |
| 80 | 79 | redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully created.' |
| 81 | 80 | else |
| 82 | 81 | @source_project = @merge_request.source_project | ... | ... |
app/models/merge_request.rb
| ... | ... | @@ -30,7 +30,9 @@ class MergeRequest < ActiveRecord::Base |
| 30 | 30 | |
| 31 | 31 | belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project" |
| 32 | 32 | belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project" |
| 33 | + | |
| 33 | 34 | has_one :merge_request_diff, dependent: :destroy |
| 35 | + after_create :create_merge_request_diff | |
| 34 | 36 | |
| 35 | 37 | delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil |
| 36 | 38 | ... | ... |
app/observers/merge_request_observer.rb
| ... | ... | @@ -6,7 +6,6 @@ class MergeRequestObserver < ActivityObserver |
| 6 | 6 | create_event(merge_request, Event.determine_action(merge_request)) |
| 7 | 7 | end |
| 8 | 8 | |
| 9 | - merge_request.create_merge_request_diff | |
| 10 | 9 | notification.new_merge_request(merge_request, current_user) |
| 11 | 10 | merge_request.create_cross_references!(merge_request.project, current_user) |
| 12 | 11 | execute_hooks(merge_request) | ... | ... |
lib/api/merge_requests.rb