Merge branch 'shards' into 'master'

Implement multiple repository mount points

See merge request !4578

2 files changed, 26 insertions, 11 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 5a23a18fe9c..4e2a43e45e2 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -376,6 +376,7 @@ module API
       expose :user_oauth_applications
       expose :after_sign_out_path
       expose :container_registry_token_expire_delay
+      expose :repository_storage
     end
 
     class Release < Grape::Entity
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 1d361569d59..b32503e8516 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -20,6 +20,20 @@ module API
           @wiki ||= params[:project].end_with?('.wiki') &&
             !Project.find_with_namespace(params[:project])
         end
+
+        def project
+          @project ||= begin
+            project_path = params[:project]
+
+            # Check for *.wiki repositories.
+            # Strip out the .wiki from the pathname before finding the
+            # project. This applies the correct project permissions to
+            # the wiki repository as well.
+            project_path.chomp!('.wiki') if wiki?
+
+            Project.find_with_namespace(project_path)
+          end
+        end
       end
 
       post "/allowed" do
@@ -32,16 +46,6 @@ module API
             User.find_by(id: params[:user_id])
           end
 
-        project_path = params[:project]
-
-        # Check for *.wiki repositories.
-        # Strip out the .wiki from the pathname before finding the
-        # project. This applies the correct project permissions to
-        # the wiki repository as well.
-        project_path.chomp!('.wiki') if wiki?
-
-        project = Project.find_with_namespace(project_path)
-
         access =
           if wiki?
             Gitlab::GitAccessWiki.new(actor, project)
@@ -49,7 +53,17 @@ module API
             Gitlab::GitAccess.new(actor, project)
           end
 
-        access.check(params[:action], params[:changes])
+        access_status = access.check(params[:action], params[:changes])
+
+        response = { status: access_status.status, message: access_status.message }
+
+        if access_status.status
+          # Return the repository full path so that gitlab-shell has it when
+          # handling ssh commands
+          response[:repository_path] = project.repository.path_to_repo
+        end
+
+        response
       end
 
       #