diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-18 19:15:17 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-19 17:09:50 +0200 |
| commit | 7524d7c0822b9aef962163272874e648ef3bdcff (patch) | |
| tree | f193726aa96f41442e7bfd01fcb74bdda224e000 /app/models/milestone.rb | |
| parent | 74a6732c0dfc1416cad382203544d9c4d6246f58 (diff) | |
| download | gitlab-ce-7524d7c0822b9aef962163272874e648ef3bdcff.tar.gz | |
Revert merge request states renaming
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/milestone.rb')
| -rw-r--r-- | app/models/milestone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 9c543b37023..e0c5fec97b7 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -56,7 +56,7 @@ class Milestone < ActiveRecord::Base end def closed_items_count - self.issues.closed.count + self.merge_requests.closed.count + self.issues.closed.count + self.merge_requests.closed_and_merged.count end def total_items_count |