diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-25 17:00:27 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-25 17:01:14 +0200 |
| commit | ebe9c89082d1536d3f4c7e2071692277e7957d57 (patch) | |
| tree | ce5e2bdde2036f52db4aaf8f805e2a6587715fc8 /app/models/merge_request.rb | |
| parent | 84cb0dcbcd361730afcfbc72ea4aa7d9204f12d4 (diff) | |
| download | gitlab-ce-ebe9c89082d1536d3f4c7e2071692277e7957d57.tar.gz | |
Consistently refer to MRs as either Accepted or Rejected.
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 64f3c39f131..d164076730b 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -133,7 +133,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) } + scope :rejected, -> { with_states(:closed) } def validate_branches if target_project == source_project && target_branch == source_branch |