Download as
Browse Code »

Commit 4b3afe2325e063943bdec123154a576f6a300bce

Authored by Dmitriy Zaporozhets
1 parent 94865a60
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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
  Diff comments   View file @4b3afe2
@@ -76,7 +76,6 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController @@ -76,7 +76,6 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
76 @merge_request.author = current_user 76 @merge_request.author = current_user
77 @target_branches ||= [] 77 @target_branches ||= []
78 if @merge_request.save 78 if @merge_request.save
79 - @merge_request.reload_code  
80 redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully created.' 79 redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully created.'
81 else 80 else
82 @source_project = @merge_request.source_project 81 @source_project = @merge_request.source_project
app/models/merge_request.rb
  Diff comments   View file @4b3afe2
@@ -30,7 +30,9 @@ class MergeRequest &lt; ActiveRecord::Base @@ -30,7 +30,9 @@ class MergeRequest &lt; ActiveRecord::Base
30 30
31 belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project" 31 belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
32 belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project" 32 belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
  33 +
33 has_one :merge_request_diff, dependent: :destroy 34 has_one :merge_request_diff, dependent: :destroy
  35 + after_create :create_merge_request_diff
34 36
35 delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil 37 delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil
36 38
app/observers/merge_request_observer.rb
  Diff comments   View file @4b3afe2
@@ -6,7 +6,6 @@ class MergeRequestObserver &lt; ActivityObserver @@ -6,7 +6,6 @@ class MergeRequestObserver &lt; ActivityObserver
6 create_event(merge_request, Event.determine_action(merge_request)) 6 create_event(merge_request, Event.determine_action(merge_request))
7 end 7 end
8 8
9 - merge_request.create_merge_request_diff  
10 notification.new_merge_request(merge_request, current_user) 9 notification.new_merge_request(merge_request, current_user)
11 merge_request.create_cross_references!(merge_request.project, current_user) 10 merge_request.create_cross_references!(merge_request.project, current_user)
12 execute_hooks(merge_request) 11 execute_hooks(merge_request)
lib/api/merge_requests.rb
  Diff comments   View file @4b3afe2
@@ -88,7 +88,6 @@ module API @@ -88,7 +88,6 @@ module API
88 end 88 end
89 89
90 if merge_request.save 90 if merge_request.save
91 - merge_request.reload_code  
92 present merge_request, with: Entities::MergeRequest 91 present merge_request, with: Entities::MergeRequest
93 else 92 else
94 handle_merge_request_errors! merge_request.errors 93 handle_merge_request_errors! merge_request.errors