kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fl-fix-next-flag-for-good' into 'master'

Browse source 
Next badge must be visible when canary flag is true

See merge request gitlab-org/gitlab-ce!28478
This commit is contained in:
Phil Hughes 2019-05-20 15:14:59 +00:00
commit a5fb32b5bf
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/main.js
View file

@ -148,7 +148,7 @@ function deferredInitialisation() {
const canaryBadge = document.querySelector('.js-canary-badge');
const canaryLink = document.querySelector('.js-canary-link');
if (canaryBadge) {
canaryBadge.classList.add('hidden');
canaryBadge.classList.remove('hidden');
}
if (canaryLink) {
canaryLink.classList.add('hidden');

2
app/views/layouts/header/_default.html.haml
View file

@ -18,7 +18,7 @@
%span.logo-text.d-none.d-lg-block.prepend-left-8
= logo_text
- if Gitlab.com?
= link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent', target: :_blank do
= link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent hidden', target: :_blank do
%span.color-label.has-tooltip.badge.badge-pill.green-badge
= _('Next')

5
changelogs/unreleased/fl-fix-next-flag-for-good.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Next badge must visible when canary flag is true
merge_request:
author:
type: fixed