diff options
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index c527bbcf6ea..3ad42c03b0b 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -503,14 +503,18 @@ class MergeRequest < ActiveRecord::Base def state_human_name if merged? - "Merged" + "已合并" elsif closed? - "Closed" + "已关闭" else - "Open" + "未关闭" end end + def zh_name + '合并请求' + end + def state_icon_name if merged? "check" |