Merge branch 'master' into jej-pages-picked-from-ee

1 files changed, 1 insertions, 5 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index a1034e80b6c..7c5fdad5122 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -373,10 +373,6 @@ class Project < ActiveRecord::Base
     def group_ids
       joins(:namespace).where(namespaces: { type: 'Group' }).select(:namespace_id)
     end
-
-    # Add alias for Routable method for compatibility with old code.
-    # In future all calls `find_with_namespace` should be replaced with `find_by_full_path`
-    alias_method :find_with_namespace, :find_by_full_path
   end
 
   def lfs_enabled?
@@ -1395,6 +1391,6 @@ class Project < ActiveRecord::Base
   def pending_delete_twin
     return false unless path
 
-    Project.unscoped.where(pending_delete: true).find_with_namespace(path_with_namespace)
+    Project.unscoped.where(pending_delete: true).find_by_full_path(path_with_namespace)
   end
 end