Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
7a36fd10
Commit
7a36fd10
authored
Mar 28, 2018
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be explicit about when yellow favicon is used
parent
fca02e24
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
changelogs/unreleased/add-canary-favicon.yml
changelogs/unreleased/add-canary-favicon.yml
+1
-1
spec/serializers/status_entity_spec.rb
spec/serializers/status_entity_spec.rb
+1
-1
No files found.
changelogs/unreleased/add-canary-favicon.yml
View file @
7a36fd10
---
---
title
:
Add yellow favicon to differientate canary environment
title
:
Add yellow favicon
when `CANARY=true`
to differientate canary environment
merge_request
:
12477
merge_request
:
12477
author
:
author
:
type
:
changed
type
:
changed
spec/serializers/status_entity_spec.rb
View file @
7a36fd10
...
@@ -26,7 +26,7 @@ describe StatusEntity do
...
@@ -26,7 +26,7 @@ describe StatusEntity do
expect
(
entity
.
as_json
[
:favicon
]).
to
match_asset_path
(
'/assets/ci_favicons/dev/favicon_status_success.ico'
)
expect
(
entity
.
as_json
[
:favicon
]).
to
match_asset_path
(
'/assets/ci_favicons/dev/favicon_status_success.ico'
)
end
end
it
'contains a cana
va
ry namespaced favicon if canary env'
do
it
'contains a canary namespaced favicon if canary env'
do
stub_env
(
'CANARY'
,
'true'
)
stub_env
(
'CANARY'
,
'true'
)
expect
(
entity
.
as_json
[
:favicon
]).
to
match_asset_path
(
'/assets/ci_favicons/canary/favicon_status_success.ico'
)
expect
(
entity
.
as_json
[
:favicon
]).
to
match_asset_path
(
'/assets/ci_favicons/canary/favicon_status_success.ico'
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment