diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-04 08:53:36 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-04 08:53:36 +0000 |
| commit | 70b64c8dd56da566499b5434c5b405967cfda1b6 (patch) | |
| tree | 4b98f7c99cc070897264fb82360dff1c77da6744 | |
| parent | 88959e872e92549a9b3e6255bfe9c70ef2194b24 (diff) | |
| parent | 2b12520d71deab8e2a612f6a44ba8f77d4f04744 (diff) | |
| download | gitlab-ce-70b64c8dd56da566499b5434c5b405967cfda1b6.tar.gz | |
Merge branch 'icons-profile-icons' into 'master'
Updated Profile Events Helper to use SVG Sprite Icons
See merge request gitlab-org/gitlab-ce!14577
| -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) |