Download as
Browse Code »

Commit 9ee49c5c49ee5f44efee5cd91117c6b45c0ce825

Authored by Andrew Kumanyaev
1 parent c147b571
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update merge requests from fork project to origin project 

Fix error described in https://github.com/gitlabhq/gitlabhq/issues/5185
Showing 1 changed file with 5 additions and 1 deletions   Show diff stats
app/models/project.rb
  Diff comments   View file @9ee49c5
... ... @@ -53,6 +53,7 @@ class Project < ActiveRecord::Base
53 53 has_many :services, dependent: :destroy
54 54 has_many :events, dependent: :destroy
55 55 has_many :merge_requests, dependent: :destroy, foreign_key: "target_project_id"
  56 + has_many :fork_merge_requests,dependent: :destroy, foreign_key: "source_project_id", class_name: MergeRequest
56 57 has_many :issues, dependent: :destroy, order: "state DESC, created_at DESC"
57 58 has_many :milestones, dependent: :destroy
58 59 has_many :notes, dependent: :destroy
... ... @@ -312,8 +313,11 @@ class Project < ActiveRecord::Base
312 313 branch_name = ref.gsub("refs/heads/", "")
313 314 c_ids = self.repository.commits_between(oldrev, newrev).map(&:id)
314 315  
315   - # Update code for merge requests
  316 + # Update code for merge requests into project between project branches
316 317 mrs = self.merge_requests.opened.by_branch(branch_name).all
  318 + # Update code for merge requests between project and project fork
  319 + mrs += self.fork_merge_requests.opened.by_branch(branch_name).all
  320 +
317 321 mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
318 322  
319 323 # Close merge requests
... ...