Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-02 18:39:24 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-02 18:39:24 +0300
commit810c91fe35db6a83c9c517e03d07dc1795922646 (patch)
tree009f34d5e515e38cc5b31b5b8620a8d8e504d6ec /app/views/search
parenta0d0a0179134c16c84dfa18da9db78b375cd7cd0 (diff)
Refactor search by commits message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/search')
-rw-r--r--app/views/search/_category.html.haml2
-rw-r--r--app/views/search/results/_commits.html.haml32
2 files changed, 2 insertions, 32 deletions
diff --git a/app/views/search/_category.html.haml b/app/views/search/_category.html.haml
index ef43f727d8b..481451edb23 100644
--- a/app/views/search/_category.html.haml
+++ b/app/views/search/_category.html.haml
@@ -46,7 +46,7 @@
= link_to search_filter_path(scope: 'commits') do
= icon('history fw')
%span
- Commit Logs
+ Commits
%span.badge
= @search_results.commits_count
diff --git a/app/views/search/results/_commits.html.haml b/app/views/search/results/_commits.html.haml
index 8076174e59d..7cff694350f 100644
--- a/app/views/search/results/_commits.html.haml
+++ b/app/views/search/results/_commits.html.haml
@@ -1,32 +1,2 @@
.search-result-row
- .commits-row-title
- %strong.str-truncated
- = link_to commits.title, namespace_project_commit_path(@project.namespace, @project, commits.id), class: "commit_short_id"
-
- .pull-right
- = link_to commits.short_id, namespace_project_commit_path(@project.namespace, @project, commits.id), class: "commit_short_id"
-
- .notes_count
- - if @note_counts
- - note_count = @note_counts.fetch(commits.id, 0)
- - else
- - notes = commits.notes
- - note_count = notes.user.count
-
- - if note_count > 0
- %span.light
- %i.fa.fa-comments
- = note_count
-
- - if commits.description?
- .commits-row-description
- %pre
- = preserve(gfm(escape_once(commits.description)))
-
- .commits-row-info
- = commit_author_link(commits, avatar: true, size: 24)
- authored
- .committed_ago
- #{time_ago_with_tooltip(commits.committed_date)} &nbsp;
- = link_to_browse_code(@project, commits)
- %br
+ = render 'projects/commits/commit', project: @project, commit: commits