Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 10 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 096c78dc73c..a07d4147228 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2736,11 +2736,6 @@ class Project < ApplicationRecord
     ci_config_path.blank? || ci_config_path == Gitlab::FileDetector::PATTERNS[:gitlab_ci]
   end
 
-  # DO NOT USE. This method will be deprecated soon
-  def uses_external_project_ci_config?
-    !!(ci_config_path =~ %r{@.+/.+})
-  end
-
   def limited_protected_branches(limit)
     protected_branches.limit(limit)
   end
@@ -2861,11 +2856,6 @@ class Project < ApplicationRecord
     repository.gitlab_ci_yml_for(sha, ci_config_path_or_default)
   end
 
-  # DO NOT USE. This method will be deprecated soon
-  def ci_config_external_project
-    Project.find_by_full_path(ci_config_path.split('@', 2).last)
-  end
-
   def enabled_group_deploy_keys
     return GroupDeployKey.none unless group