deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2

Browse source 
Conflicts:
	app/models/merge_request.rb
This commit is contained in:
Dmitriy Zaporozhets 2013-02-26 10:38:40 +02:00
commit d7b667fee2
10 changed files with 97 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/project.rb
View file

@ -321,7 +321,7 @@ class Project < ActiveRecord::Base
c_ids = self.repository.commits_between(oldrev, newrev).map(&:id)
# Update code for merge requests
mrs = self.merge_requests.opened.find_all_by_branch(branch_name).all
mrs = self.merge_requests.opened.by_branch(branch_name).all
mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
# Close merge requests