Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/framework/common.scss

@@ -89,6 +89,10 @@ hr {
 .str-truncated {
   @include str-truncated;
 
+  &-30 {
+    @include str-truncated(30%);
+  }
+
   &-60 {
     @include str-truncated(60%);
   }

app/views/projects/_home_panel.html.haml

@@ -21,8 +21,13 @@
           - if @project.tag_list.present?
             %span.home-panel-topic-list.d-inline-flex.prepend-left-8.has-tooltip{ data: { container: 'body' }, title: @project.has_extra_topics? ? @project.tag_list.join(', ') : nil }
               = sprite_icon('tag', size: 16, css_class: 'icon append-right-4')
-              = @project.topics_to_show
+
+              - @project.topics_to_show.each do |topic|
+                %a{ class: 'badge badge-pill badge-secondary append-right-5 str-truncated-30', href: explore_projects_path(tag: topic) }
+                  = topic.titleize
+
               - if @project.has_extra_topics?
+                .text-nowrap
                   = _("+ %{count} more") % { count: @project.count_of_extra_topics_not_shown }
 
 

changelogs/unreleased/54544-update-project-topics-styling-to-use-badges-design.yml

+---
+title: Update project topics styling to use badges design
+merge_request: 24415
+author:
+type: changed

spec/features/projects_spec.rb

@@ -110,16 +110,23 @@ describe 'Project' do
 
     it 'shows project topics' do
       project.update_attribute(:tag_list, 'topic1')
+
       visit path
+
       expect(page).to have_css('.home-panel-topic-list')
-      expect(page).to have_content('topic1')
+      expect(page).to have_link('Topic1', href: explore_projects_path(tag: 'topic1'))
     end
 
     it 'shows up to 3 project tags' do
       project.update_attribute(:tag_list, 'topic1, topic2, topic3, topic4')
+
       visit path
+
       expect(page).to have_css('.home-panel-topic-list')
-      expect(page).to have_content('topic1, topic2, topic3 + 1 more')
+      expect(page).to have_link('Topic1', href: explore_projects_path(tag: 'topic1'))
+      expect(page).to have_link('Topic2', href: explore_projects_path(tag: 'topic2'))
+      expect(page).to have_link('Topic3', href: explore_projects_path(tag: 'topic3'))
+      expect(page).to have_content('+ 1 more')
     end
   end