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

Fix merge request closed filter. Fixed one more test

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-21 14:11:24 +02:00
parent be817c53c6
commit 4a137651ec
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/merge_request.rb
View file

@ -66,6 +66,10 @@ class MergeRequest < ActiveRecord::Base
scope :merged, -> { with_state(:merged) }
# Closed scope for merge request should return
# both merged and closed mr's
scope :closed, -> { with_states(:closed, :merged) }
class << self
def find_all_by_branch(branch_name)
where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)