diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-13 22:14:38 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-13 22:14:38 +0300 |
| commit | 9d0fc98c7d36d4865cb719333b1bd3000b629978 (patch) | |
| tree | 67c17796d2cb5232432b7f94ff9b6b8b44d4c808 /app/models | |
| parent | 83998c0a33c70c786f48eef5ce723eb6dd76761f (diff) | |
| parent | a5439897d20b80274733605862d050b2abfb1cb3 (diff) | |
Merge branch '33926-update-issuable-icons' into 'master'
Update issuable status icons
Closes #33926
See merge request gitlab-org/gitlab-ce!15898
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 993006760f7..f627ce260a3 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -887,11 +887,11 @@ class MergeRequest < ActiveRecord::Base def state_icon_name if merged? - "check" + "git-merge" elsif closed? - "times" + "close" else - "circle-o" + "issue-open-m" end end |