Commit 47459726 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '344320-update-search-badges-pajamas' into 'master'

Update search badges to pajamas

See merge request gitlab-org/gitlab!77812
parents 8fa4d3c1 a60ee444
...@@ -336,7 +336,7 @@ module SearchHelper ...@@ -336,7 +336,7 @@ module SearchHelper
link_to search_path(search_params) do link_to search_path(search_params) do
concat label concat label
concat ' ' concat ' '
concat content_tag(:span, count, class: ['badge badge-pill gl-badge badge-muted sm', badge_class], data: badge_data) concat gl_badge_tag(count, { size: :sm }, { class: badge_class, data: badge_data })
end end
end end
end end
......
...@@ -4,6 +4,7 @@ require 'spec_helper' ...@@ -4,6 +4,7 @@ require 'spec_helper'
RSpec.describe SearchHelper do RSpec.describe SearchHelper do
include MarkupHelper include MarkupHelper
include BadgesHelper
# Override simple_sanitize for our testing purposes # Override simple_sanitize for our testing purposes
def simple_sanitize(str) def simple_sanitize(str)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment