diff options
| author | Michel Engelen <michel@nomorejs.net> | 2019-06-28 11:16:45 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-28 11:16:45 +0000 |
| commit | 42683d761f423f553cc3a35224f79efa78ab74c8 (patch) | |
| tree | e97631b93baa5dfa98085c69edb4c0efb683aebc | |
| parent | e17edd37ab3a33d874d6ad7af92f0f5045d970c7 (diff) | |
| download | gitlab-ce-42683d761f423f553cc3a35224f79efa78ab74c8.tar.gz | |
added code difference in `app/views/search/_category.html.haml` from EE to CE
| -rw-r--r-- | app/views/search/_category.html.haml | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/views/search/_category.html.haml b/app/views/search/_category.html.haml index df408e5fb60..ee7d89a9bd8 100644 --- a/app/views/search/_category.html.haml +++ b/app/views/search/_category.html.haml @@ -87,4 +87,5 @@ = _("Milestones") %span.badge.badge-pill = limited_count(@search_results.limited_milestones_count) + = render_if_exists 'search/category_elasticsearch' = users diff --git a/changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml b/changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml new file mode 100644 index 00000000000..10c5eed9556 --- /dev/null +++ b/changelogs/unreleased/11039-moved-code-difference-from-EE-to-CE.yml @@ -0,0 +1,5 @@ +--- +title: "Moved EE/CE code differences for file `app/views/search/_category.html.haml` into CE" +merge_request: 28755 +author: Michel Engelen +type: other |