diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-06 21:09:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-06 21:09:43 +0300 |
commit | 33998a0e768263828f497685ae030f585193317f (patch) | |
tree | 791e2c3322a17f668a2a4abdd251a8362885f381 /app/helpers | |
parent | 7b69a22d499787378aa30561822ef797a99c22e5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/application_helper.rb | 4 | ||||
-rw-r--r-- | app/helpers/todos_helper.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4afbe98226e..93b7c8c0b94 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -284,10 +284,6 @@ module ApplicationHelper !params.has_key?(:no_startup_css) end - def use_new_fonts? - Feature.enabled?(:new_fonts, current_user) || request.params.has_key?(:new_fonts) - end - def outdated_browser? browser.ie? end diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index daaf86e55a0..4a9dd30a5a2 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -139,6 +139,8 @@ module TodosHelper variant = 'info' if state == 'closed' when AlertManagement::Alert variant = 'info' if state == 'resolved' + else + variant = 'info' end content_tag(:span, class: 'todo-target-state') do |