diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 09:07:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 09:07:50 +0300 |
| commit | e50050a8756a20b6aa118edbad3369674e4c63ba (patch) | |
| tree | 0f9ae83c168b01707753e066294f7b55aa0968a5 /app/helpers | |
| parent | 1dffba3bd853076efc1107b2dd63e221e75a210c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/nav_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/system_note_helper.rb | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 7d48efcff01..6013475acb1 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -65,10 +65,6 @@ module NavHelper %w(groups#issues labels#index milestones#index boards#index boards#show) end - def show_user_notification_dot? - experiment_enabled?(:ci_notification_dot) - end - private def get_header_links diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb index 6702a805cb7..d3b6ecf2bd7 100644 --- a/app/helpers/system_note_helper.rb +++ b/app/helpers/system_note_helper.rb @@ -26,7 +26,8 @@ module SystemNoteHelper 'duplicate' => 'duplicate', 'locked' => 'lock', 'unlocked' => 'lock-open', - 'due_date' => 'calendar' + 'due_date' => 'calendar', + 'health_status' => 'status-health' }.freeze def system_note_icon_name(note) |