diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-21 14:11:24 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-21 14:11:24 +0200 |
| commit | 4a137651ec0408699b9ad137ba8794429f524f32 (patch) | |
| tree | 87a67bdf0a1a6feee20ec172c335b11ca6241113 /app/models/merge_request.rb | |
| parent | be817c53c6fcf946bc149b2e603e3809e79d9d36 (diff) | |
| download | gitlab-ce-4a137651ec0408699b9ad137ba8794429f524f32.tar.gz | |
Fix merge request closed filter. Fixed one more test
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 06aa9f3c9e0..1bc3428476e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -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) |