Automatic merge of gitlab-org/gitlab-ce master

PROCESS.md

@@ -56,7 +56,7 @@ Below we describe the contributing process to GitLab for two reasons:
 Several people from the [GitLab team][team] are helping community members to get
 their contributions accepted by meeting our [Definition of done][done].
 
-What you can expect from them is described at https://about.gitlab.com/roles/merge-request-coach/.
+What you can expect from them is described at https://about.gitlab.com/job-families/expert/merge-request-coach/.
 
 ### Milestones on community contribution issues
 

app/views/projects/_home_panel.html.haml

@@ -23,7 +23,7 @@
               = sprite_icon('tag', size: 16, css_class: 'icon append-right-4')
               = @project.topics_to_show
               - if @project.has_extra_topics?
-                = _("+ %{count} more") % { count: @project.count_of_extra_tags_not_shown  }
+                = _("+ %{count} more") % { count: @project.count_of_extra_topics_not_shown  }
 
 
     .project-repo-buttons.col-md-12.col-lg-6.d-inline-flex.flex-wrap.justify-content-lg-end

spec/features/projects_spec.rb

@@ -99,6 +99,30 @@ describe 'Project' do
     end
   end
 
+  describe 'project topics' do
+    let(:project) { create(:project, :repository) }
+    let(:path)    { project_path(project) }
+
+    before do
+      sign_in(create(:admin))
+      visit path
+    end
+
+    it 'shows project topics' do
+      project.update_attribute(:tag_list, 'topic1')
+      visit path
+      expect(page).to have_css('.project-topic-list')
+      expect(page).to have_content('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('.project-topic-list')
+      expect(page).to have_content('topic1, topic2, topic3 + 1 more')
+    end
+  end
+
   describe 'copy clone URL to clipboard', :js do
     let(:project) { create(:project, :repository) }
     let(:path)    { project_path(project) }