Commit 46527a69 authored by charlie ablett's avatar charlie ablett

Merge branch '284392-use-info-style-for-merged-instead-of-primary' into 'master'

Use info colour for merged search results instead of primary

See merge request gitlab-org/gitlab!55008
parents edf074f7 22c845cf
...@@ -406,7 +406,7 @@ module SearchHelper ...@@ -406,7 +406,7 @@ module SearchHelper
# Closed is considered "danger" for MR so we need to handle separately # Closed is considered "danger" for MR so we need to handle separately
if issuable.is_a?(::MergeRequest) if issuable.is_a?(::MergeRequest)
if issuable.merged? if issuable.merged?
:primary :info
elsif issuable.closed? elsif issuable.closed?
:danger :danger
else else
......
---
title: Use info colour for merged search results instead of primary
merge_request: 55008
author:
type: changed
...@@ -580,7 +580,7 @@ RSpec.describe SearchHelper do ...@@ -580,7 +580,7 @@ RSpec.describe SearchHelper do
describe '#issuable_state_to_badge_class' do describe '#issuable_state_to_badge_class' do
context 'with merge request' do context 'with merge request' do
it 'returns correct badge based on status' do it 'returns correct badge based on status' do
expect(issuable_state_to_badge_class(build(:merge_request, :merged))).to eq(:primary) expect(issuable_state_to_badge_class(build(:merge_request, :merged))).to eq(:info)
expect(issuable_state_to_badge_class(build(:merge_request, :closed))).to eq(:danger) expect(issuable_state_to_badge_class(build(:merge_request, :closed))).to eq(:danger)
expect(issuable_state_to_badge_class(build(:merge_request, :opened))).to eq(:success) expect(issuable_state_to_badge_class(build(:merge_request, :opened))).to eq(:success)
end end
......
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