Skip to content

G
gitlab-ce
Commit bf8a1d58 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/assets/javascripts/dispatcher.js

parent 3fe8a7a3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/views/search/_category.html.haml
View file @ bf8a1d58
...@@ -78,7 +78,6 @@ ...@@ -78,7 +78,6 @@
Milestones Milestones
%span.badge %span.badge
= limited_count(@search_results.limited_milestones_count) = limited_count(@search_results.limited_milestones_count)
<<<<<<< HEAD
- if current_application_settings.elasticsearch_search? - if current_application_settings.elasticsearch_search?
%li{ class: active_when(@scope == 'blobs') } %li{ class: active_when(@scope == 'blobs') }
= link_to search_filter_path(scope: 'blobs') do = link_to search_filter_path(scope: 'blobs') do
...@@ -95,5 +94,3 @@ ...@@ -95,5 +94,3 @@
Wiki Wiki
%span.badge %span.badge
= limited_count(@search_results.wiki_blobs_count) = limited_count(@search_results.wiki_blobs_count)
=======
>>>>>>> upstream/master
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7