Add latest changes from gitlab-org/gitlab@master

9 files changed, 69 insertions, 6 deletions

diff --git a/lib/api/api.rb b/lib/api/api.rb
index 5816d2db534..433edc1daba 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -162,6 +162,7 @@ module API
       mount ::API::MergeRequestDiffs
       mount ::API::MergeRequests
       mount ::API::Metrics::Dashboard::Annotations
+      mount ::API::Metrics::UserStarredDashboards
       mount ::API::Namespaces
       mount ::API::Notes
       mount ::API::Discussions
diff --git a/lib/api/entities/job_request/artifacts.rb b/lib/api/entities/job_request/artifacts.rb
index c6871fdd875..0d27f5a9189 100644
--- a/lib/api/entities/job_request/artifacts.rb
+++ b/lib/api/entities/job_request/artifacts.rb
@@ -7,6 +7,7 @@ module API
         expose :name
         expose :untracked
         expose :paths
+        expose :exclude, expose_nil: false
         expose :when
         expose :expire_in
         expose :artifact_type
diff --git a/lib/api/entities/metrics/user_starred_dashboard.rb b/lib/api/entities/metrics/user_starred_dashboard.rb
new file mode 100644
index 00000000000..d774160e3ea
--- /dev/null
+++ b/lib/api/entities/metrics/user_starred_dashboard.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Metrics
+      class UserStarredDashboard < Grape::Entity
+        expose :id, :dashboard_path, :user_id, :project_id
+      end
+    end
+  end
+end
diff --git a/lib/api/metrics/user_starred_dashboards.rb b/lib/api/metrics/user_starred_dashboards.rb
new file mode 100644
index 00000000000..478403b40ad
--- /dev/null
+++ b/lib/api/metrics/user_starred_dashboards.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module API
+  module Metrics
+    class UserStarredDashboards < Grape::API
+      desc 'Marks selected metrics dashboard as starred' do
+        success Entities::Metrics::UserStarredDashboard
+      end
+
+      params do
+        requires :dashboard_path, type: String, allow_blank: false, coerce_with: ->(val) { CGI.unescape(val) },
+                 desc: 'Url encoded path to a file defining the dashboard to which the star should be added'
+      end
+
+      resource :projects do
+        post ':id/metrics/user_starred_dashboards' do
+          result = ::Metrics::UsersStarredDashboards::CreateService.new(current_user, user_project, params[:dashboard_path]).execute
+
+          if result.success?
+            present result.payload, with: Entities::Metrics::UserStarredDashboard
+          else
+            error!({ errors: result.message }, 400)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/wikis.rb b/lib/api/wikis.rb
index a42cb9b49af..884e3019a2d 100644
--- a/lib/api/wikis.rb
+++ b/lib/api/wikis.rb
@@ -123,9 +123,11 @@ module API
       post ":id/wikis/attachments" do
         authorize! :create_wiki, user_project
 
-        result = ::Wikis::CreateAttachmentService.new(user_project,
-                                                      current_user,
-                                                      commit_params(declared_params(include_missing: false))).execute
+        result = ::Wikis::CreateAttachmentService.new(
+          container: user_project,
+          current_user: current_user,
+          params: commit_params(declared_params(include_missing: false))
+        ).execute
 
         if result[:status] == :success
           status(201)
diff --git a/lib/gitlab/ci/config/entry/artifacts.rb b/lib/gitlab/ci/config/entry/artifacts.rb
index ea9d35f2ccc..a9a9636637f 100644
--- a/lib/gitlab/ci/config/entry/artifacts.rb
+++ b/lib/gitlab/ci/config/entry/artifacts.rb
@@ -12,7 +12,7 @@ module Gitlab
           include ::Gitlab::Config::Entry::Validatable
           include ::Gitlab::Config::Entry::Attributable
 
-          ALLOWED_KEYS = %i[name untracked paths reports when expire_in expose_as].freeze
+          ALLOWED_KEYS = %i[name untracked paths reports when expire_in expose_as exclude].freeze
           EXPOSE_AS_REGEX = /\A\w[-\w ]*\z/.freeze
           EXPOSE_AS_ERROR_MESSAGE = "can contain only letters, digits, '-', '_' and spaces"
 
@@ -35,6 +35,8 @@ module Gitlab
               }, if: :expose_as_present?
               validates :expose_as, type: String, length: { maximum: 100 }, if: :expose_as_present?
               validates :expose_as, format: { with: EXPOSE_AS_REGEX, message: EXPOSE_AS_ERROR_MESSAGE }, if: :expose_as_present?
+              validates :exclude, array_of_strings: true, if: :exclude_enabled?
+              validates :exclude, absence: { message: 'feature is disabled' }, unless: :exclude_enabled?
               validates :reports, type: Hash
               validates :when,
                 inclusion: { in: %w[on_success on_failure always],
@@ -57,6 +59,10 @@ module Gitlab
 
             !@config[:expose_as].nil?
           end
+
+          def exclude_enabled?
+            ::Gitlab::Ci::Features.artifacts_exclude_enabled?
+          end
         end
       end
     end
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
new file mode 100644
index 00000000000..a8edb42194f
--- /dev/null
+++ b/lib/gitlab/ci/features.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    ##
+    # Ci::Features is a class that aggregates all CI/CD feature flags in one place.
+    #
+    module Features
+      def self.artifacts_exclude_enabled?
+        ::Feature.enabled?(:ci_artifacts_exclude, default_enabled: false)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index 7f98f0074d8..46f4aa3118f 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -1,5 +1,5 @@
 .auto-deploy:
-  image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.13.0"
+  image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.14.0"
 
 review:
   extends: .auto-deploy
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index bf14bd4ab4b..08006657b07 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -502,7 +502,7 @@ module Gitlab
               update_column_in_batches(table, column, default_after_type_cast, &block)
             end
 
-            add_not_null_constraint(table, column) unless allow_null
+            change_column_null(table, column, false) unless allow_null
           # We want to rescue _all_ exceptions here, even those that don't inherit
           # from StandardError.
           rescue Exception => error # rubocop: disable all