Automatic merge of gitlab-org/gitlab-ce master

.gitlab-ci.yml

@@ -1189,10 +1189,8 @@ schedule:review-build-cng:
 
 .review-deploy-base: &review-deploy-base
   <<: *review-base
-  retry: 2
   allow_failure: true
   variables:
-    GIT_DEPTH: "1"
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
     DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
     GITLAB_HELM_CHART_REF: "master"

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

@@ -54,7 +54,10 @@ export default Vue.extend({
       return `${n__('%d issue', '%d issues', issuesSize)}`;
     },
     isNewIssueShown() {
-      return this.list.type === 'backlog' || (!this.disabled && this.list.type !== 'closed');
+      return (
+        this.list.type === 'backlog' ||
+        (!this.disabled && this.list.type !== 'closed' && this.list.type !== 'blank')
+      );
     },
   },
   watch: {

app/assets/stylesheets/pages/boards.scss

@@ -234,7 +234,7 @@
 }
 
 .board-title-text {
-  margin-right: auto;
+  margin: $gl-vert-padding auto $gl-vert-padding 0;
 }
 
 .board-delete {

changelogs/unreleased/55980-remove-add-issue-on-blank-list.yml

+---
+title: Remove non-functional add issue button on welcome list
+merge_request: !26742
+author:
+type: fixed

spec/javascripts/boards/components/board_spec.js

@@ -103,4 +103,18 @@ describe('Board component', () => {
       })
       .catch(done.fail);
   });
+
+  it('does render add issue button', () => {
+    expect(vm.$el.querySelector('.issue-count-badge-add-button')).not.toBeNull();
+  });
+
+  it('does not render add issue button when list type is blank', done => {
+    vm.list.type = 'blank';
+
+    Vue.nextTick(() => {
+      expect(vm.$el.querySelector('.issue-count-badge-add-button')).toBeNull();
+
+      done();
+    });
+  });
 });