Merge branch...

Merge branch '1639-show-project-names-for-commit-search-result-with-elasticsearch-global-search' into 'master'

Shows project names for commit elastic search global search

Closes #1639

See merge request !2434

app/assets/stylesheets/pages/commits.scss

@@ -178,6 +178,10 @@
   .merge-request-branches & {
     flex-direction: column;
   }
+
+  .project_namespace {
+    color: $gl-text-color-secondary;
+  }
 }
 
 .commit-content {

app/views/projects/commits/_commit.html.haml

 - ref = local_assigns.fetch(:ref)
+- show_project_name = local_assigns.fetch(:show_project_name, false)
 - if @note_counts
   - note_count = @note_counts.fetch(commit.id, 0)
 - else
@@ -34,6 +35,9 @@
           - commit_timeago = time_ago_with_tooltip(commit.committed_date)
           - commit_text =  _('%{commit_author_link} committed %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago }
           #{ commit_text.html_safe }
+        - if show_project_name
+          %span.project_namespace
+            = project.name_with_namespace
 
 
       .commit-actions.flex-row.hidden-xs

app/views/search/results/_commit.html.haml

-= render 'projects/commits/commit', project: commit.project, commit: commit, ref: nil
+= render 'projects/commits/commit', project: commit.project, commit: commit, ref: nil, show_project_name: true

changelogs/unreleased-ee/1639-show-project-names-for-commit-search-result-with-elasticsearch-global-search.yml

+---
+title: Shows project names for commits in elasticsearch global search
+merge_request: 2434
+author:

spec/features/es_global_search_spec.rb

@@ -93,6 +93,7 @@ feature 'Global elastic search', feature: true do
       select_filter("Commits")
 
       expect(page).to have_selector('.commit-row-description')
+      expect(page).to have_selector('.project_namespace')
     end
   end
 end