Merge branch '3441-group-board-labels' into 'master'

show project labels on group board cards

Closes #3441

See merge request gitlab-org/gitlab-ee!2957

app/assets/javascripts/boards/components/issue_card_inner.js

@@ -111,7 +111,6 @@ gl.issueBoards.IssueCardInner = Vue.extend({
     },
     showLabel(label) {
       if (!label.id) return false;
-      if (this.groupId && label.type === 'ProjectLabel') return false;
       return true;
     },
     filterByLabel(label, e) {

spec/javascripts/boards/issue_card_spec.js

@@ -322,7 +322,7 @@ describe('Issue card component', () => {
         .catch(done.fail);
     });
-    it('does not show project labels on group boards', (done) => {
+    it('shows project labels on group boards', (done) => {
       component.issue.addLabel(new ListLabel({
         id: 123,
         title: 'Project label',
@@ -334,10 +334,10 @@ describe('Issue card component', () => {
         .then(() => {
           expect(
             component.$el.querySelectorAll('.label').length,
-          ).toBe(2);
+          ).toBe(3);
           expect(
             component.$el.textContent,
-          ).not.toContain('Project label');
+          ).toContain('Project label');
           done();
         })