diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-05 21:24:49 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-05 21:24:49 +0300 |
| commit | 8ec0fd0a42d0c166d103433f58513e3bb94e5e7b (patch) | |
| tree | 778a3c7c32ea59d7b8e52a1db3485c7c761397f7 /app/views | |
| parent | d0b3d1201d4a465208cd7993409d628272920a9b (diff) | |
| parent | 5656a1d608aa6c1ab703e8051bd460efe92dc5de (diff) | |
[ci skip] Merge branch 'master' into 38587-pipelines-empty-state
* master: (52 commits)
Projects and groups badges API
Keep a commit around if its sha is present
#43691: DiffNotes not counted by ContributionsCalendar
Cleanup after adding MR diff's commit_count
Fix MR merge commit cross-references to the MR itself
Fix n+1 issue by not reloading fully loaded blobs
Add "added" type on changelog
Use limited count queries also for scoped searches
Update changelog
Rename quick actions handler
Adds updated_at filter to issues and merge_requests API
Update API: add search param to branches
Add changelog entry
LabelsSelect DropdownValueCollapsed Component
LabelsSelect DropdownValue Component
LabelsSelect DropdownTitle Component
LabelsSelect DropdownSearchInput Component
LabelsSelect DropdownHiddenInput Component
LabelsSelect DropdownHeader Component
LabelsSelect DropdownFooter Component
...
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 6 | ||||
| -rw-r--r-- | app/views/search/_category.html.haml | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index b565f14747a..a2ecfddb163 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -23,6 +23,12 @@ - deleted_message = s_('ForkedFromProjectPath|Forked from %{project_name} (deleted)') = deleted_message % { project_name: fork_source_name(@project) } + .project-badges + - @project.badges.each do |badge| + - badge_link_url = badge.rendered_link_url(@project) + %a{ href: badge_link_url, target: '_blank', rel: 'noopener noreferrer' } + %img{ src: badge.rendered_image_url(@project), alt: badge_link_url } + .project-repo-buttons .count-buttons = render 'projects/buttons/star' diff --git a/app/views/search/_category.html.haml b/app/views/search/_category.html.haml index 915e648a5d3..7d43fd61081 100644 --- a/app/views/search/_category.html.haml +++ b/app/views/search/_category.html.haml @@ -14,25 +14,25 @@ = link_to search_filter_path(scope: 'issues') do Issues %span.badge - = @search_results.issues_count + = limited_count(@search_results.limited_issues_count) - if project_search_tabs?(:merge_requests) %li{ class: active_when(@scope == 'merge_requests') } = link_to search_filter_path(scope: 'merge_requests') do Merge requests %span.badge - = @search_results.merge_requests_count + = limited_count(@search_results.limited_merge_requests_count) - if project_search_tabs?(:milestones) %li{ class: active_when(@scope == 'milestones') } = link_to search_filter_path(scope: 'milestones') do Milestones %span.badge - = @search_results.milestones_count + = limited_count(@search_results.limited_milestones_count) - if project_search_tabs?(:notes) %li{ class: active_when(@scope == 'notes') } = link_to search_filter_path(scope: 'notes') do Comments %span.badge - = @search_results.notes_count + = limited_count(@search_results.limited_notes_count) - if project_search_tabs?(:wiki) %li{ class: active_when(@scope == 'wiki_blobs') } = link_to search_filter_path(scope: 'wiki_blobs') do |