9 files changed, 24 insertions, 88 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab38c87039e..f89a52e7a3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1018,10 +1018,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"
diff --git a/app/assets/javascripts/boards/components/board.js b/app/assets/javascripts/boards/components/board.js
index fb6e5291a61..45b9e57f9ab 100644
--- a/app/assets/javascripts/boards/components/board.js
+++ b/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: {
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index ed0e9db035b..fc1c1bd9962 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/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 {
diff --git a/app/graphql/gitlab_schema.rb b/app/graphql/gitlab_schema.rb
index ecc34eacc7d..06d26309b5b 100644
--- a/app/graphql/gitlab_schema.rb
+++ b/app/graphql/gitlab_schema.rb
@@ -5,7 +5,6 @@ class GitlabSchema < GraphQL::Schema
   use Gitlab::Graphql::Authorize
   use Gitlab::Graphql::Present
   use Gitlab::Graphql::Connections
-  use Gitlab::Graphql::Tracing
 
   query(Types::QueryType)
 
diff --git a/changelogs/unreleased/55980-remove-add-issue-on-blank-list.yml b/changelogs/unreleased/55980-remove-add-issue-on-blank-list.yml
new file mode 100644
index 00000000000..4c16b635297
--- /dev/null
+++ b/changelogs/unreleased/55980-remove-add-issue-on-blank-list.yml
@@ -0,0 +1,5 @@
+---
+title: Remove non-functional add issue button on welcome list
+merge_request: !26742
+author:
+type: fixed
diff --git a/changelogs/unreleased/graphql-prometheus.yml b/changelogs/unreleased/graphql-prometheus.yml
deleted file mode 100644
index 180577f3aec..00000000000
--- a/changelogs/unreleased/graphql-prometheus.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added prometheus monitoring to GraphQL
-merge_request:
-author:
-type: added
diff --git a/lib/gitlab/graphql/tracing.rb b/lib/gitlab/graphql/tracing.rb
deleted file mode 100644
index 6b505e4262b..00000000000
--- a/lib/gitlab/graphql/tracing.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Graphql
-    class Tracing < GraphQL::Tracing::PlatformTracing
-      self.platform_keys = {
-        'lex' => 'graphql.lex',
-        'parse' => 'graphql.parse',
-        'validate' => 'graphql.validate',
-        'analyze_query' => 'graphql.analyze',
-        'analyze_multiplex' => 'graphql.analyze',
-        'execute_multiplex' => 'graphql.execute',
-        'execute_query' => 'graphql.execute',
-        'execute_query_lazy' => 'graphql.execute',
-        'execute_field' => 'graphql.execute',
-        'execute_field_lazy' => 'graphql.execute'
-      }
-
-      def platform_field_key(type, field)
-        "#{type.name}.#{field.name}"
-      end
-
-      def platform_trace(platform_key, key, data, &block)
-        start = Gitlab::Metrics::System.monotonic_time
-
-        yield
-      ensure
-        duration = Gitlab::Metrics::System.monotonic_time - start
-
-        graphql_duration_seconds.observe({ platform_key: platform_key, key: key }, duration)
-      end
-
-      private
-
-      def graphql_duration_seconds
-        @graphql_duration_seconds ||= Gitlab::Metrics.histogram(
-          :graphql_duration_seconds,
-          'GraphQL execution time'
-        )
-      end
-    end
-  end
-end
diff --git a/spec/javascripts/boards/components/board_spec.js b/spec/javascripts/boards/components/board_spec.js
index 6e6b3e6950b..d08ee41802b 100644
--- a/spec/javascripts/boards/components/board_spec.js
+++ b/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();
+    });
+  });
 });
diff --git a/spec/lib/gitlab/graphql/tracing_spec.rb b/spec/lib/gitlab/graphql/tracing_spec.rb
deleted file mode 100644
index 6bae737d0f6..00000000000
--- a/spec/lib/gitlab/graphql/tracing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Gitlab::Graphql::Tracing do
-  let!(:graphql_duration_seconds) { double('Gitlab::Metrics::NullMetric') }
-
-  before do
-    allow(Gitlab::Metrics)
-      .to receive(:histogram)
-      .with(:graphql_duration_seconds, 'GraphQL execution time')
-      .and_return(graphql_duration_seconds)
-  end
-
-  it 'updates graphql histogram with expected labels' do
-    query = 'query { users { id } }'
-
-    expect_metric('graphql.lex', 'lex')
-    expect_metric('graphql.parse', 'parse')
-    expect_metric('graphql.validate', 'validate')
-    expect_metric('graphql.analyze', 'analyze_multiplex')
-    expect_metric('graphql.execute', 'execute_query_lazy')
-    expect_metric('graphql.execute', 'execute_multiplex')
-
-    GitlabSchema.execute(query)
-  end
-
-  private
-
-  def expect_metric(platform_key, key)
-    expect(graphql_duration_seconds)
-      .to receive(:observe)
-      .with({ platform_key: platform_key, key: key }, be > 0.0)
-  end
-end