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
56430fb9
Commit
56430fb9
authored
Mar 12, 2021
by
Paul Slaughter
Committed by
Chad Woolley
Mar 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use combined_menu feature flag
- Scoped to user
parent
dc71bc15
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+6
-3
app/views/layouts/nav/_combined_menu.html.haml
app/views/layouts/nav/_combined_menu.html.haml
+3
-0
No files found.
app/views/layouts/header/_default.html.haml
View file @
56430fb9
...
@@ -19,6 +19,9 @@
...
@@ -19,6 +19,9 @@
%span
.gl-badge.gl-bg-green-500.gl-text-white.gl-rounded-pill.gl-font-weight-bold.gl-py-1
%span
.gl-badge.gl-bg-green-500.gl-text-white.gl-rounded-pill.gl-font-weight-bold.gl-py-1
=
_
(
'Next'
)
=
_
(
'Next'
)
-
if
Feature
.
enabled?
(
:combined_menu
,
current_user
,
default_enabled: :yaml
)
=
render
"layouts/nav/combined_menu"
-
else
-
if
current_user
-
if
current_user
=
render
"layouts/nav/dashboard"
=
render
"layouts/nav/dashboard"
-
else
-
else
...
...
app/views/layouts/nav/_combined_menu.html.haml
0 → 100644
View file @
56430fb9
%button
{
type:
'button'
,
data:
{
toggle:
"dropdown"
}
}
=
sprite_icon
(
'ellipsis_v'
)
=
_
(
'Projects'
)
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