Add latest changes from gitlab-org/gitlab@master

7 files changed, 11 insertions, 8 deletions

diff --git a/app/assets/javascripts/ide/services/index.js b/app/assets/javascripts/ide/services/index.js
index 84a2b2bd58e..3adf0cf073f 100644
--- a/app/assets/javascripts/ide/services/index.js
+++ b/app/assets/javascripts/ide/services/index.js
@@ -25,7 +25,7 @@ export default {
       return Promise.resolve(file.content);
     }
 
-    if (file.raw) {
+    if (file.raw || !file.rawPath) {
       return Promise.resolve(file.raw);
     }
 
diff --git a/app/finders/license_template_finder.rb b/app/finders/license_template_finder.rb
index 1db175e1308..4d68b963dc3 100644
--- a/app/finders/license_template_finder.rb
+++ b/app/finders/license_template_finder.rb
@@ -13,8 +13,6 @@
 class LicenseTemplateFinder
   include Gitlab::Utils::StrongMemoize
 
-  prepend_if_ee('::EE::LicenseTemplateFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
   attr_reader :project, :params
 
   def initialize(project, params = {})
@@ -52,3 +50,5 @@ class LicenseTemplateFinder
     params.fetch(:popular, nil)
   end
 end
+
+LicenseTemplateFinder.prepend_if_ee('::EE::LicenseTemplateFinder')
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb
index 23648e0f494..3a84600b09f 100644
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@@ -27,8 +27,6 @@
 class ProjectsFinder < UnionFinder
   include CustomAttributesFilter
 
-  prepend_if_ee('::EE::ProjectsFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
   attr_accessor :params
   attr_reader :current_user, :project_ids_relation
 
@@ -225,3 +223,5 @@ class ProjectsFinder < UnionFinder
     { min_access_level: params[:min_access_level] }
   end
 end
+
+ProjectsFinder.prepend_if_ee('::EE::ProjectsFinder')
diff --git a/app/finders/template_finder.rb b/app/finders/template_finder.rb
index dfea3d427c2..78c8392f1cd 100644
--- a/app/finders/template_finder.rb
+++ b/app/finders/template_finder.rb
@@ -3,8 +3,6 @@
 class TemplateFinder
   include Gitlab::Utils::StrongMemoize
 
-  prepend_if_ee('::EE::TemplateFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
   VENDORED_TEMPLATES = HashWithIndifferentAccess.new(
     dockerfiles: ::Gitlab::Template::DockerfileTemplate,
     gitignores: ::Gitlab::Template::GitignoreTemplate,
@@ -42,3 +40,5 @@ class TemplateFinder
     end
   end
 end
+
+TemplateFinder.prepend_if_ee('::EE::TemplateFinder')
diff --git a/app/models/container_expiration_policy.rb b/app/models/container_expiration_policy.rb
index ccb0a0f8acd..76bfbabf3b3 100644
--- a/app/models/container_expiration_policy.rb
+++ b/app/models/container_expiration_policy.rb
@@ -2,6 +2,7 @@
 
 class ContainerExpirationPolicy < ApplicationRecord
   include Schedulable
+  include UsageStatistics
 
   belongs_to :project, inverse_of: :container_expiration_policy
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 4cd92b119b4..ee4cc6157eb 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -787,7 +787,7 @@ class Project < ApplicationRecord
   end
 
   def jira_issues_import_feature_flag_enabled?
-    Feature.enabled?(:jira_issue_import, self)
+    Feature.enabled?(:jira_issue_import, self, default_enabled: true)
   end
 
   def team
diff --git a/app/presenters/clusters/cluster_presenter.rb b/app/presenters/clusters/cluster_presenter.rb
index 3ace27c72d5..c4e3393cac9 100644
--- a/app/presenters/clusters/cluster_presenter.rb
+++ b/app/presenters/clusters/cluster_presenter.rb
@@ -89,3 +89,5 @@ module Clusters
     end
   end
 end
+
+Clusters::ClusterPresenter.prepend_if_ee('EE::Clusters::ClusterPresenter')