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
0efdf53b
Commit
0efdf53b
authored
Aug 18, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move ConvDev index to Overview from Monitoring.
parent
965d87a2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
app/views/admin/dashboard/_head.html.haml
app/views/admin/dashboard/_head.html.haml
+4
-0
app/views/admin/monitoring/_head.html.haml
app/views/admin/monitoring/_head.html.haml
+0
-4
app/views/layouts/nav/_new_admin_sidebar.html.haml
app/views/layouts/nav/_new_admin_sidebar.html.haml
+4
-4
changelogs/unreleased/34413-move-convdev-index-location-to-after-cohorts.yml
...ed/34413-move-convdev-index-location-to-after-cohorts.yml
+4
-0
No files found.
app/views/admin/dashboard/_head.html.haml
View file @
0efdf53b
...
@@ -31,3 +31,7 @@
...
@@ -31,3 +31,7 @@
=
link_to
admin_cohorts_path
,
title:
'Cohorts'
do
=
link_to
admin_cohorts_path
,
title:
'Cohorts'
do
%span
%span
Cohorts
Cohorts
=
nav_link
(
controller: :conversational_development_index
)
do
=
link_to
admin_conversational_development_index_path
,
title:
'ConvDev Index'
do
%span
ConvDev Index
app/views/admin/monitoring/_head.html.haml
View file @
0efdf53b
...
@@ -3,10 +3,6 @@
...
@@ -3,10 +3,6 @@
=
render
'shared/nav_scroll'
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
(
container_class
)
}
%ul
{
class:
(
container_class
)
}
=
nav_link
(
controller: :conversational_development_index
)
do
=
link_to
admin_conversational_development_index_path
,
title:
'ConvDev Index'
do
%span
ConvDev Index
=
nav_link
(
controller: :system_info
)
do
=
nav_link
(
controller: :system_info
)
do
=
link_to
admin_system_info_path
,
title:
'System Info'
do
=
link_to
admin_system_info_path
,
title:
'System Info'
do
%span
%span
...
...
app/views/layouts/nav/_new_admin_sidebar.html.haml
View file @
0efdf53b
...
@@ -42,6 +42,10 @@
...
@@ -42,6 +42,10 @@
=
link_to
admin_cohorts_path
,
title:
'Cohorts'
do
=
link_to
admin_cohorts_path
,
title:
'Cohorts'
do
%span
%span
Cohorts
Cohorts
=
nav_link
(
controller: :conversational_development_index
)
do
=
link_to
admin_conversational_development_index_path
,
title:
'ConvDev Index'
do
%span
ConvDev Index
=
nav_link
(
controller:
%w(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)
)
do
=
nav_link
(
controller:
%w(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)
)
do
=
link_to
admin_conversational_development_index_path
,
title:
'Monitoring'
do
=
link_to
admin_conversational_development_index_path
,
title:
'Monitoring'
do
...
@@ -51,10 +55,6 @@
...
@@ -51,10 +55,6 @@
Monitoring
Monitoring
%ul
.sidebar-sub-level-items
%ul
.sidebar-sub-level-items
=
nav_link
(
controller: :conversational_development_index
)
do
=
link_to
admin_conversational_development_index_path
,
title:
'ConvDev Index'
do
%span
ConvDev Index
=
nav_link
(
controller: :system_info
)
do
=
nav_link
(
controller: :system_info
)
do
=
link_to
admin_system_info_path
,
title:
'System Info'
do
=
link_to
admin_system_info_path
,
title:
'System Info'
do
%span
%span
...
...
changelogs/unreleased/34413-move-convdev-index-location-to-after-cohorts.yml
0 → 100644
View file @
0efdf53b
---
title
:
Move ConvDev Index location to after Cohorts.
merge_request
:
!13398
author
:
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