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
2aec9fcc
Commit
2aec9fcc
authored
Sep 19, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict in app/views/layouts/nav/sidebar/_admin.html.haml
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
f7678eed
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
app/views/layouts/nav/sidebar/_admin.html.haml
app/views/layouts/nav/sidebar/_admin.html.haml
+0
-4
No files found.
app/views/layouts/nav/sidebar/_admin.html.haml
View file @
2aec9fcc
...
...
@@ -52,11 +52,7 @@
%span
ConvDev Index
<
<<<<<<
HEAD
=
nav_link
(
controller:
%w(system_info background_jobs logs health_check requests_profiles audit_logs)
)
do
==
=====
=
nav_link
(
controller:
%w(system_info background_jobs logs health_check requests_profiles)
)
do
>
>>>>>> ce-com/master
=
link_to
admin_system_info_path
do
.nav-icon-container
=
custom_icon
(
'monitoring'
)
...
...
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