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
0151eb59
Commit
0151eb59
authored
7 years ago
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly link ConvDev Index nav links to its controller.
parent
2f46c3a8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
7 deletions
+12
-7
app/views/layouts/nav/sidebar/_admin.html.haml
app/views/layouts/nav/sidebar/_admin.html.haml
+6
-6
changelogs/unreleased/conv-dev-index-regression.yml
changelogs/unreleased/conv-dev-index-regression.yml
+5
-0
doc/user/admin_area/monitoring/convdev.md
doc/user/admin_area/monitoring/convdev.md
+1
-1
doc/user/admin_area/monitoring/img/convdev_index.png
doc/user/admin_area/monitoring/img/convdev_index.png
+0
-0
No files found.
app/views/layouts/nav/sidebar/_admin.html.haml
View file @
0151eb59
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
=
icon
(
'wrench'
)
=
icon
(
'wrench'
)
.sidebar-context-title
Admin Area
.sidebar-context-title
Admin Area
%ul
.sidebar-top-level-items
%ul
.sidebar-top-level-items
=
nav_link
(
controller:
%w(dashboard admin projects users groups jobs runners cohorts)
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
controller:
%w(dashboard admin projects users groups jobs runners cohorts
conversational_development_index
)
,
html_options:
{
class:
'home'
})
do
=
sidebar_link
admin_root_path
,
title:
_
(
'Overview'
),
css:
'shortcuts-tree'
do
=
sidebar_link
admin_root_path
,
title:
_
(
'Overview'
),
css:
'shortcuts-tree'
do
.nav-icon-container
.nav-icon-container
=
custom_icon
(
'overview'
)
=
custom_icon
(
'overview'
)
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
Overview
Overview
%ul
.sidebar-sub-level-items
%ul
.sidebar-sub-level-items
=
nav_link
(
controller:
%w(dashboard admin projects users groups jobs runners cohorts)
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
nav_link
(
controller:
%w(dashboard admin projects users groups jobs runners cohorts
conversational_development_index
)
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
link_to
admin_root_path
do
=
link_to
admin_root_path
do
%strong
.fly-out-top-item-name
%strong
.fly-out-top-item-name
#{
_
(
'Overview'
)
}
#{
_
(
'Overview'
)
}
...
@@ -52,16 +52,16 @@
...
@@ -52,16 +52,16 @@
%span
%span
ConvDev Index
ConvDev Index
=
nav_link
(
controller:
%w(
conversational_development_index
system_info background_jobs logs health_check requests_profiles)
)
do
=
nav_link
(
controller:
%w(system_info background_jobs logs health_check requests_profiles)
)
do
=
sidebar_link
admin_
conversational_development_index
_path
,
title:
_
(
'Monitoring'
)
do
=
sidebar_link
admin_
system_info
_path
,
title:
_
(
'Monitoring'
)
do
.nav-icon-container
.nav-icon-container
=
custom_icon
(
'monitoring'
)
=
custom_icon
(
'monitoring'
)
%span
.nav-item-name
%span
.nav-item-name
Monitoring
Monitoring
%ul
.sidebar-sub-level-items
%ul
.sidebar-sub-level-items
=
nav_link
(
controller:
%w(
conversational_development_index
system_info background_jobs logs health_check requests_profiles)
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
nav_link
(
controller:
%w(system_info background_jobs logs health_check requests_profiles)
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
link_to
admin_
conversational_development_index
_path
do
=
link_to
admin_
system_info
_path
do
%strong
.fly-out-top-item-name
%strong
.fly-out-top-item-name
#{
_
(
'Monitoring'
)
}
#{
_
(
'Monitoring'
)
}
%li
.divider.fly-out-top-item
%li
.divider.fly-out-top-item
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/conv-dev-index-regression.yml
0 → 100644
View file @
0151eb59
---
title
:
Fix ConvDev Index nav item and Monitoring submenu regression
merge_request
:
!14124
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
doc/user/admin_area/monitoring/convdev.md
View file @
0151eb59
...
@@ -23,7 +23,7 @@ If you have just started using GitLab, it may take a few weeks for data to be
...
@@ -23,7 +23,7 @@ If you have just started using GitLab, it may take a few weeks for data to be
collected before this feature is available.
collected before this feature is available.
This feature is accessible only to a system admin, at
This feature is accessible only to a system admin, at
**Admin area >
Monitoring
> ConvDev Index**
.
**Admin area >
Overview
> ConvDev Index**
.
[
ce-30469
]:
https://gitlab.com/gitlab-org/gitlab-ce/issues/30469
[
ce-30469
]:
https://gitlab.com/gitlab-org/gitlab-ce/issues/30469
[
ping
]:
../settings/usage_statistics.md#usage-ping
[
ping
]:
../settings/usage_statistics.md#usage-ping
This diff is collapsed.
Click to expand it.
doc/user/admin_area/monitoring/img/convdev_index.png
View replaced file @
2f46c3a8
View file @
0151eb59
30.3 KB
|
W:
0px
|
H:
0px
113 KB
|
W:
0px
|
H:
0px
2-up
Swipe
Onion skin
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