diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-05 08:49:16 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-05 08:49:16 +0300 |
| commit | 88cc9d5294198cfa748d602236729abcd73f56a6 (patch) | |
| tree | 6eb5be9ed46ec720ba195702d80e166980868146 /app/helpers | |
| parent | d6e22e83d1fe8ffaa71c3bcb7906731733a89f0e (diff) | |
| parent | 8921af39e74976e37e92c786bd957883110f6522 (diff) | |
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/events_helper.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index b331693c789..fd88e0d794a 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -1,13 +1,15 @@ module EventsHelper ICON_NAMES_BY_EVENT_TYPE = { - 'pushed to' => 'icon_commit', - 'pushed new' => 'icon_commit', - 'created' => 'icon_status_open', - 'opened' => 'icon_status_open', - 'closed' => 'icon_status_closed', - 'accepted' => 'icon_code_fork', - 'commented on' => 'icon_comment_o', - 'deleted' => 'icon_trash_o' + 'pushed to' => 'commit', + 'pushed new' => 'commit', + 'created' => 'status_open', + 'opened' => 'status_open', + 'closed' => 'status_closed', + 'accepted' => 'fork', + 'commented on' => 'comment', + 'deleted' => 'remove', + 'imported' => 'import', + 'joined' => 'users' }.freeze def link_to_author(event, self_added: false) @@ -197,7 +199,7 @@ module EventsHelper def icon_for_event(note) icon_name = ICON_NAMES_BY_EVENT_TYPE[note] - custom_icon(icon_name) if icon_name + sprite_icon(icon_name) if icon_name end def icon_for_profile_event(event) |