Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

8 files changed, 21 insertions, 55 deletions

diff --git a/app/views/search/_filter.html.haml b/app/views/search/_filter.html.haml
deleted file mode 100644
index e9c6b581c90..00000000000
--- a/app/views/search/_filter.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-- if params[:group_id].present?
-  = hidden_field_tag :group_id, params[:group_id]
-- if params[:project_id].present?
-  = hidden_field_tag :project_id, params[:project_id]
-- project_attributes = @project&.attributes&.slice('id', 'namespace_id', 'name')&.merge(name_with_namespace: @project&.name_with_namespace)
-
-.dropdown.form-group.mb-lg-0.mx-lg-1.gl-p-0{ data: { testid: "group-filter" } }
-  %label.d-block{ for: "dashboard_search_group" }
-    = _("Group")
-  %input#js-search-group-dropdown.dropdown-menu-toggle{ value: "Loading...", data: { "initial-data": @group.to_json } }
-.dropdown.form-group.mb-lg-0.mx-lg-1.gl-p-0{ data: { testid: "project-filter" } }
-  %label.d-block{ for: "dashboard_search_project" }
-    = _("Project")
-  %input#js-search-project-dropdown.dropdown-menu-toggle{ value: "Loading...", data: { "initial-data": project_attributes.to_json } }
diff --git a/app/views/search/_form.html.haml b/app/views/search/_form.html.haml
deleted file mode 100644
index a9eee1dd2d6..00000000000
--- a/app/views/search/_form.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-= form_tag search_path, method: :get, class: 'search-page-form js-search-form' do |f|
-  = hidden_field_tag :snippets, params[:snippets]
-  = hidden_field_tag :scope, params[:scope]
-  = hidden_field_tag :repository_ref, params[:repository_ref]
-
-  .d-lg-flex.align-items-end
-    .search-field-holder.form-group.mr-lg-1.mb-lg-0
-      %label{ for: "dashboard_search" }
-        = _("What are you searching for?")
-      .gl-search-box-by-type
-        = search_field_tag :search, params[:search], placeholder: _("Search for projects, issues, etc."), class: "gl-form-input form-control search-text-input js-search-input", id: "dashboard_search", autofocus: true, spellcheck: false
-        = sprite_icon('search', css_class: 'gl-search-box-by-type-search-icon gl-icon')
-        %button.search-clear.js-search-clear{ class: [("hidden" if params[:search].blank?), "has-tooltip"], type: "button", tabindex: "-1", title: _('Clear') }
-          = sprite_icon('clear')
-          %span.sr-only
-            = _("Clear search")
-    - unless params[:snippets].eql? 'true'
-      = render 'filter'
-    .d-flex-center.flex-column.flex-lg-row
-      = button_tag _("Search"), class: "gl-button btn btn-success btn-search mt-lg-0 ml-lg-1 align-self-end"
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml
index 80d0253d273..d5fbee34fa0 100644
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -1,7 +1,7 @@
 - search_bar_classes = 'search-sidebar gl-display-flex gl-flex-direction-column gl-mr-4'
 
 - if @search_objects.to_a.empty?
-  .gl-display-md-flex
+  .gl-md-display-flex
     - if %w(issues merge_requests).include?(@scope)
       #js-search-sidebar{ class: search_bar_classes }
     .gl-w-full.gl-flex-fill-1.gl-overflow-x-hidden
@@ -11,7 +11,7 @@
   = render partial: 'search/results_status', locals: { search_service: @search_service }
   = render_if_exists 'shared/promotions/promote_advanced_search'
 
-  .results.gl-display-md-flex.gl-mt-3
+  .results.gl-md-display-flex.gl-mt-3
     - if %w(issues merge_requests).include?(@scope)
       #js-search-sidebar{ class: search_bar_classes }
     .gl-w-full.gl-flex-fill-1.gl-overflow-x-hidden
diff --git a/app/views/search/_results_status.html.haml b/app/views/search/_results_status.html.haml
index e55f225b162..dcfab046514 100644
--- a/app/views/search/_results_status.html.haml
+++ b/app/views/search/_results_status.html.haml
@@ -4,7 +4,7 @@
 
 .search-results-status
   .row-content-block.gl-display-flex
-    .gl-display-md-flex.gl-text-left.gl-align-items-center.gl-flex-grow-1
+    .gl-md-display-flex.gl-text-left.gl-align-items-center.gl-flex-grow-1
       - unless search_service.without_count?
         = search_entries_info(search_service.search_objects, search_service.scope, params[:search])
       - unless search_service.show_snippets?
@@ -21,5 +21,5 @@
           - link_to_group = link_to(search_service.group.name, search_service.group, class: 'ml-md-1')
           = _("in group %{link_to_group}").html_safe % { link_to_group: link_to_group }
     - if search_service.show_sort_dropdown?
-      .gl-display-md-flex.gl-flex-direction-column
-        = render partial: 'search/sort_dropdown'
+      .gl-md-display-flex.gl-flex-direction-column
+        #js-search-sort{ data: { "search-sort-options" => search_sort_options.to_json } }
diff --git a/app/views/search/_sort_dropdown.html.haml b/app/views/search/_sort_dropdown.html.haml
deleted file mode 100644
index 4ae6513d395..00000000000
--- a/app/views/search/_sort_dropdown.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-- sort_value = @sort
-- sort_title = search_sort_option_title(sort_value)
-
-.dropdown.gl-display-inline-block.gl-ml-3.filter-dropdown-container
-  .btn-group{ role: 'group' }
-    .btn-group{ role: 'group' }
-    %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' }
-      = sort_title
-      = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
-    %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
-      %li
-        = render_if_exists('search/sort_by_relevancy', sort_title: sort_title)
-        = sortable_item(sort_title_recently_created, page_filter_path(sort: sort_value_recently_created), sort_title)
-    = search_sort_direction_button(sort_value)
diff --git a/app/views/search/opensearch.xml.erb b/app/views/search/opensearch.xml.erb
new file mode 100644
index 00000000000..9d08f56f290
--- /dev/null
+++ b/app/views/search/opensearch.xml.erb
@@ -0,0 +1,9 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
+                       xmlns:moz="http://www.mozilla.org/2006/browser/search/">
+  <ShortName>GitLab</ShortName>
+  <Description>Search GitLab</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <Image width="16" height="16" type="image/x-icon"><%= root_url %>favicon.ico</Image>
+  <Url type="text/html" method="get" template="<%= search_url %>?search={searchTerms}"/>
+  <moz:SearchForm><%= search_url %></moz:SearchForm>
+</OpenSearchDescription>
\ No newline at end of file
diff --git a/app/views/search/results/_issuable.html.haml b/app/views/search/results/_issuable.html.haml
index 288ac53a954..8aad4848aa2 100644
--- a/app/views/search/results/_issuable.html.haml
+++ b/app/views/search/results/_issuable.html.haml
@@ -5,6 +5,6 @@
     = link_to issuable_path(issuable), data: { track_event: 'click_text', track_label: "#{issuable.class.name.downcase}_title", track_property: 'search_result' }, class: 'gl-w-full' do
       %span.term.str-truncated.gl-font-weight-bold.gl-ml-2= issuable.title
   .gl-text-gray-500.gl-my-3
-    = sprintf(s_(' %{project_name}#%{issuable_iid} &middot; opened %{issuable_created} by %{author}'), { project_name: issuable.project.full_name, issuable_iid: issuable.iid, issuable_created: time_ago_with_tooltip(issuable.created_at, placement: 'bottom'), author: link_to_member(@project, issuable.author, avatar: false) }).html_safe
+    = sprintf(s_(' %{project_name}#%{issuable_iid} &middot; opened %{issuable_created} by %{author} &middot; updated %{issuable_updated}'), { project_name: issuable.project.full_name, issuable_iid: issuable.iid, issuable_created: time_ago_with_tooltip(issuable.created_at, placement: 'bottom'), issuable_updated: time_ago_with_tooltip(issuable.updated_at, placement: 'bottom'), author: link_to_member(@project, issuable.author, avatar: false) }).html_safe
   .description.term.col-sm-10.gl-px-0
     = highlight_and_truncate_issuable(issuable, @search_term, @search_highlight)
diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index 3fb91428c56..d54310bfa82 100644
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -1,6 +1,11 @@
 - @hide_top_links = true
 - page_title @search_term
 - @hide_breadcrumbs = true
+- if params[:group_id].present?
+  = hidden_field_tag :group_id, params[:group_id]
+- if params[:project_id].present?
+  = hidden_field_tag :project_id, params[:project_id]
+- project_attributes = @project&.attributes&.slice('id', 'namespace_id', 'name')&.merge(name_with_namespace: @project&.name_with_namespace)
 
 - if @search_results
   - page_description(_("%{count} %{scope} for term '%{term}'") % { count: @search_results.formatted_count(@scope), scope: @scope, term: @search_term })
@@ -11,7 +16,7 @@
   = render_if_exists 'search/form_elasticsearch', attrs: { class: 'mb-2 mb-sm-0 align-self-center' }
 
 .gl-mt-3
-  = render 'search/form'
+  #js-search-topbar{ data: { "group-initial-data": @group.to_json, "project-initial-data": project_attributes.to_json } }
 - if @search_term
   = render 'search/category'
   = render 'search/results'