Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index b2a65d9f2d8..553a10eb054 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -9,7 +9,6 @@ module Gitlab
     ForbiddenError = Class.new(StandardError)
     NotFoundError = Class.new(StandardError)
     TimeoutError = Class.new(StandardError)
-    ProjectMovedError = Class.new(NotFoundError)
 
     # Use the magic string '_any' to indicate we do not know what the
     # changes are. This is also what gitlab-shell does.
@@ -148,11 +147,11 @@ module Gitlab
       raise NotFoundError, not_found_message if container.nil?
 
       check_project! if project?
+      add_container_moved_message!
     end
 
     def check_project!
       check_project_accessibility!
-      add_project_moved_message!
     end
 
     def check_custom_action
@@ -221,12 +220,12 @@ module Gitlab
       error_message(:project_not_found)
     end
 
-    def add_project_moved_message!
+    def add_container_moved_message!
       return if redirected_path.nil?
 
-      project_moved = Checks::ProjectMoved.new(repository, user, protocol, redirected_path)
+      container_moved = Checks::ContainerMoved.new(repository, user, protocol, redirected_path)
 
-      project_moved.add_message
+      container_moved.add_message
     end
 
     def check_command_disabled!