Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-12 12:09:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-12 12:09:44 +0300
commit20bd3b7d4ebb1d7ebef305656b156313d09a6674 (patch)
treef84e01b3cb7931818aa9a399ffc09dc08d353892 /app
parent90156f527b43a15e794c3351ecfc59aff42c440a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/services/clusters/parse_cluster_applications_artifact_service.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/services/clusters/parse_cluster_applications_artifact_service.rb b/app/services/clusters/parse_cluster_applications_artifact_service.rb
index e9a23b7c5f2..b9b2953b6bd 100644
--- a/app/services/clusters/parse_cluster_applications_artifact_service.rb
+++ b/app/services/clusters/parse_cluster_applications_artifact_service.rb
@@ -14,8 +14,6 @@ module Clusters
end
def execute(artifact)
- return success unless Feature.enabled?(:cluster_applications_artifact, project)
-
raise ArgumentError, 'Artifact is not cluster_applications file type' unless artifact&.cluster_applications?
return error(too_big_error_message, :bad_request) unless artifact.file.size < MAX_ACCEPTABLE_ARTIFACT_SIZE