summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-12 21:09:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-12 21:09:39 +0000
commitcdf9ef52fe13899be29068992a9858f8b0e72457 (patch)
treed26b77d147c1a8506213c05048f026fe9ef8ad1e /app
parent13150a38e701080f6c64d4925c838214a3f5ef2c (diff)
downloadgitlab-ce-cdf9ef52fe13899be29068992a9858f8b0e72457.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/presenters/commit_status_presenter.rb4
-rw-r--r--app/serializers/build_details_entity.rb4
-rw-r--r--app/serializers/issue_entity.rb3
-rw-r--r--app/serializers/project_mirror_entity.rb4
-rw-r--r--app/uploaders/object_storage.rb4
-rw-r--r--app/workers/repository_check/batch_worker.rb4
-rw-r--r--app/workers/repository_check/single_repository_worker.rb4
7 files changed, 14 insertions, 13 deletions
diff --git a/app/presenters/commit_status_presenter.rb b/app/presenters/commit_status_presenter.rb
index 258852c77c6..23e688e562e 100644
--- a/app/presenters/commit_status_presenter.rb
+++ b/app/presenters/commit_status_presenter.rb
@@ -26,8 +26,6 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
presents :build
- prepend_if_ee('::EE::CommitStatusPresenter') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
def self.callout_failure_messages
CALLOUT_FAILURE_MESSAGES
end
@@ -44,3 +42,5 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
script_failure? || missing_dependency_failure? || archived_failure? || scheduler_failure? || data_integrity_failure?
end
end
+
+CommitStatusPresenter.prepend_if_ee('::EE::CommitStatusPresenter')
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index fe6afa4ff6f..df1bdc2b7a4 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -1,8 +1,6 @@
# frozen_string_literal: true
class BuildDetailsEntity < JobEntity
- prepend_if_ee('::EE::BuildDetailEntity') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
expose :coverage, :erased_at, :duration
expose :tag_list, as: :tags
expose :has_trace?, as: :has_trace
@@ -152,3 +150,5 @@ class BuildDetailsEntity < JobEntity
_("Please refer to <a href=\"%{docs_url}\">%{docs_url}</a>") % { docs_url: docs_url }
end
end
+
+BuildDetailsEntity.prepend_if_ee('::EE::BuildDetailEntity')
diff --git a/app/serializers/issue_entity.rb b/app/serializers/issue_entity.rb
index 98c0c703584..7c12e0956f3 100644
--- a/app/serializers/issue_entity.rb
+++ b/app/serializers/issue_entity.rb
@@ -2,7 +2,6 @@
class IssueEntity < IssuableEntity
include TimeTrackableEntity
- prepend_if_ee('::EE::IssueEntity') # rubocop: disable Cop/InjectEnterpriseEditionModule
expose :state
expose :milestone_id
@@ -73,3 +72,5 @@ class IssueEntity < IssuableEntity
help_page_path('user/project/settings/index.md', anchor: 'archiving-a-project')
end
end
+
+IssueEntity.prepend_if_ee('::EE::IssueEntity')
diff --git a/app/serializers/project_mirror_entity.rb b/app/serializers/project_mirror_entity.rb
index 2efd820d893..daea209deb4 100644
--- a/app/serializers/project_mirror_entity.rb
+++ b/app/serializers/project_mirror_entity.rb
@@ -1,11 +1,11 @@
# frozen_string_literal: true
class ProjectMirrorEntity < Grape::Entity
- prepend_if_ee('::EE::ProjectMirrorEntity') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
expose :id
expose :remote_mirrors_attributes, using: RemoteMirrorEntity do |project|
project.remote_mirrors
end
end
+
+ProjectMirrorEntity.prepend_if_ee('::EE::ProjectMirrorEntity')
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb
index 7db1b29ca9a..5297112eef8 100644
--- a/app/uploaders/object_storage.rb
+++ b/app/uploaders/object_storage.rb
@@ -137,8 +137,6 @@ module ObjectStorage
included do |base|
base.include(ObjectStorage)
- include_if_ee('::EE::ObjectStorage::Concern') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
after :migrate, :delete_migrated_file
end
@@ -463,3 +461,5 @@ module ObjectStorage
end
end
end
+
+ObjectStorage::Concern.include_if_ee('::EE::ObjectStorage::Concern')
diff --git a/app/workers/repository_check/batch_worker.rb b/app/workers/repository_check/batch_worker.rb
index 3e5e6a25228..9e762860ec6 100644
--- a/app/workers/repository_check/batch_worker.rb
+++ b/app/workers/repository_check/batch_worker.rb
@@ -2,8 +2,6 @@
module RepositoryCheck
class BatchWorker # rubocop:disable Scalability/IdempotentWorker
- prepend_if_ee('::EE::RepositoryCheck::BatchWorker') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
include ApplicationWorker
include RepositoryCheckQueue
include ExclusiveLeaseGuard
@@ -94,3 +92,5 @@ module RepositoryCheck
end
end
end
+
+RepositoryCheck::BatchWorker.prepend_if_ee('::EE::RepositoryCheck::BatchWorker')
diff --git a/app/workers/repository_check/single_repository_worker.rb b/app/workers/repository_check/single_repository_worker.rb
index b25a20b3eff..edff7fc31df 100644
--- a/app/workers/repository_check/single_repository_worker.rb
+++ b/app/workers/repository_check/single_repository_worker.rb
@@ -5,8 +5,6 @@ module RepositoryCheck
include ApplicationWorker
include RepositoryCheckQueue
- prepend_if_ee('::EE::RepositoryCheck::SingleRepositoryWorker') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
def perform(project_id)
project = Project.find(project_id)
healthy = project_healthy?(project)
@@ -68,3 +66,5 @@ module RepositoryCheck
end
end
end
+
+RepositoryCheck::SingleRepositoryWorker.prepend_if_ee('::EE::RepositoryCheck::SingleRepositoryWorker')