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
Boxiang Sun
gitlab-ce
Commits
aa583f10
Commit
aa583f10
authored
May 20, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Next badge must be visible when canary flag is true
parent
406fe0e9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+1
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+3
-2
changelogs/unreleased/fl-fix-next-flag-for-good.yml
changelogs/unreleased/fl-fix-next-flag-for-good.yml
+5
-0
No files found.
app/assets/javascripts/main.js
View file @
aa583f10
...
@@ -147,7 +147,7 @@ function deferredInitialisation() {
...
@@ -147,7 +147,7 @@ function deferredInitialisation() {
const
canaryBadge
=
document
.
querySelector
(
'
.js-canary-badge
'
);
const
canaryBadge
=
document
.
querySelector
(
'
.js-canary-badge
'
);
const
canaryLink
=
document
.
querySelector
(
'
.js-canary-link
'
);
const
canaryLink
=
document
.
querySelector
(
'
.js-canary-link
'
);
if
(
canaryBadge
)
{
if
(
canaryBadge
)
{
canaryBadge
.
classList
.
add
(
'
hidden
'
);
canaryBadge
.
classList
.
remove
(
'
hidden
'
);
}
}
if
(
canaryLink
)
{
if
(
canaryLink
)
{
canaryLink
.
classList
.
add
(
'
hidden
'
);
canaryLink
.
classList
.
add
(
'
hidden
'
);
...
...
app/views/layouts/header/_default.html.haml
View file @
aa583f10
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
%span
.logo-text.d-none.d-lg-block.prepend-left-8
%span
.logo-text.d-none.d-lg-block.prepend-left-8
=
logo_text
=
logo_text
-
if
Gitlab
.
com?
-
if
Gitlab
.
com?
%span
.js-canary-badge.badge.badge-pill.green-badge.align-self-center
=
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'
)
=
_
(
'Next'
)
-
if
current_user
-
if
current_user
...
...
changelogs/unreleased/fl-fix-next-flag-for-good.yml
0 → 100644
View file @
aa583f10
---
title
:
Next badge must visible when canary flag is
true
merge_request
:
author
:
type
:
fixed
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