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
84f5d382
Commit
84f5d382
authored
Jun 28, 2019
by
Michel Engelen
Committed by
Filipa Lacerda
Jun 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move EE-specific code to subtemplate
parent
c074cbf2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
16 deletions
+22
-16
app/views/search/_category.html.haml
app/views/search/_category.html.haml
+1
-16
changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml
.../unreleased/11039-moved-code-difference-from-EE-to-CE.yml
+5
-0
ee/app/views/search/_category_elasticsearch.html.haml
ee/app/views/search/_category_elasticsearch.html.haml
+16
-0
No files found.
app/views/search/_category.html.haml
View file @
84f5d382
...
...
@@ -87,20 +87,5 @@
=
_
(
"Milestones"
)
%span
.badge.badge-pill
=
limited_count
(
@search_results
.
limited_milestones_count
)
-
if
search_service
.
use_elasticsearch?
%li
{
class:
active_when
(
@scope
==
'blobs'
)
}
=
link_to
search_filter_path
(
scope:
'blobs'
)
do
=
_
(
"Code"
)
%span
.badge.badge-pill
=
limited_count
(
@search_results
.
blobs_count
)
%li
{
class:
active_when
(
@scope
==
'commits'
)
}
=
link_to
search_filter_path
(
scope:
'commits'
)
do
=
_
(
"Commits"
)
%span
.badge.badge-pill
=
limited_count
(
@search_results
.
commits_count
)
%li
{
class:
active_when
(
@scope
==
'wiki_blobs'
)
}
=
link_to
search_filter_path
(
scope:
'wiki_blobs'
)
do
=
_
(
"Wiki"
)
%span
.badge.badge-pill
=
limited_count
(
@search_results
.
wiki_blobs_count
)
=
render_if_exists
'search/category_elasticsearch'
=
users
changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml
0 → 100644
View file @
84f5d382
---
title
:
"
Moved
EE/CE
code
differences
for
file
`app/views/search/_category.html.haml`
into
CE"
merge_request
:
28755
author
:
Michel Engelen
type
:
other
ee/app/views/search/_category_elasticsearch.html.haml
0 → 100644
View file @
84f5d382
-
if
search_service
.
use_elasticsearch?
%li
{
class:
active_when
(
@scope
==
'blobs'
)
}
=
link_to
search_filter_path
(
scope:
'blobs'
)
do
=
_
(
"Code"
)
%span
.badge.badge-pill
=
limited_count
(
@search_results
.
blobs_count
)
%li
{
class:
active_when
(
@scope
==
'commits'
)
}
=
link_to
search_filter_path
(
scope:
'commits'
)
do
=
_
(
"Commits"
)
%span
.badge.badge-pill
=
limited_count
(
@search_results
.
commits_count
)
%li
{
class:
active_when
(
@scope
==
'wiki_blobs'
)
}
=
link_to
search_filter_path
(
scope:
'wiki_blobs'
)
do
=
_
(
"Wiki"
)
%span
.badge.badge-pill
=
limited_count
(
@search_results
.
wiki_blobs_count
)
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