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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5d3747c3
Commit
5d3747c3
authored
5 years ago
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Next badge must be visible when canary flag is true
parent
80130930
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
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
+1
-1
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 @
5d3747c3
...
...
@@ -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
'
);
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/header/_default.html.haml
View file @
5d3747c3
...
...
@@ -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'
)
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/fl-fix-next-flag-for-good.yml
0 → 100644
View file @
5d3747c3
---
title
:
Next badge must visible when canary flag is
true
merge_request
:
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
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