summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-05 13:46:13 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-05 13:46:13 +0000
commit70a6af9328b663c93a5802bf689362525ec4ae87 (patch)
tree63c97e0e01503f32dfaa9aeaf59330c4974c1950 /app/models/merge_request.rb
parent7e41eca38ae4598e083372777c20ff6aa2b491ad (diff)
parentffd50e8cf562b69a897e389a968b9366ee1e6aae (diff)
downloadgitlab-ce-70a6af9328b663c93a5802bf689362525ec4ae87.tar.gz
Merge branch 'milestone-merged-mr-list' into 'master'
Milestone merged mr list Part of #1207
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b7c4a2a923c..a501870115f 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -113,6 +113,7 @@ class MergeRequest < ActiveRecord::Base
# Closed scope for merge request should return
# both merged and closed mr's
scope :closed, -> { with_states(:closed, :merged) }
+ scope :declined, -> { with_states(:closed) }
def validate_branches
if target_project == source_project && target_branch == source_branch