1 files changed, 40 insertions, 32 deletions

diff --git a/config/routes/git_http.rb b/config/routes/git_http.rb
index aac6d418a92..593f818e434 100644
--- a/config/routes/git_http.rb
+++ b/config/routes/git_http.rb
@@ -1,43 +1,51 @@
-scope(path: '*namespace_id/:project_id',
-      format: nil,
-      constraints: { namespace_id: Gitlab::PathRegex.full_namespace_route_regex }) do
-  scope(constraints: { project_id: Gitlab::PathRegex.project_git_route_regex }, module: :projects) do
-    # Git HTTP clients ('git clone' etc.)
-    scope(controller: :git_http) do
-      get '/info/refs', action: :info_refs
-      post '/git-upload-pack', action: :git_upload_pack
-      post '/git-receive-pack', action: :git_receive_pack
-    end
+concern :gitactionable do
+  scope(controller: :git_http) do
+    get '/info/refs', action: :info_refs
+    post '/git-upload-pack', action: :git_upload_pack
+    post '/git-receive-pack', action: :git_receive_pack
+  end
+end
 
-    # Git LFS API (metadata)
-    scope(path: 'info/lfs/objects', controller: :lfs_api) do
-      post :batch
-      post '/', action: :deprecated
-      get '/*oid', action: :deprecated
-    end
+concern :lfsable do
+  # Git LFS API (metadata)
+  scope(path: 'info/lfs/objects', controller: :lfs_api) do
+    post :batch
+    post '/', action: :deprecated
+    get '/*oid', action: :deprecated
+  end
 
-    scope(path: 'info/lfs') do
-      resources :lfs_locks, controller: :lfs_locks_api, path: 'locks' do
-        post :unlock, on: :member
-        post :verify, on: :collection
-      end
+  scope(path: 'info/lfs') do
+    resources :lfs_locks, controller: :lfs_locks_api, path: 'locks' do
+      post :unlock, on: :member
+      post :verify, on: :collection
     end
+  end
 
-    # GitLab LFS object storage
-    scope(path: 'gitlab-lfs/objects/*oid', controller: :lfs_storage, constraints: { oid: /[a-f0-9]{64}/ }) do
-      get '/', action: :download
+  # GitLab LFS object storage
+  scope(path: 'gitlab-lfs/objects/*oid', controller: :lfs_storage, constraints: { oid: /[a-f0-9]{64}/ }) do
+    get '/', action: :download
 
-      scope constraints: { size: /[0-9]+/ } do
-        put '/*size/authorize', action: :upload_authorize
-        put '/*size', action: :upload_finalize
-      end
+    scope constraints: { size: /[0-9]+/ } do
+      put '/*size/authorize', action: :upload_authorize
+      put '/*size', action: :upload_finalize
+    end
+  end
+end
+
+scope(path: '*namespace_id/:repository_id',
+      format: nil,
+      constraints: { namespace_id: Gitlab::PathRegex.full_namespace_route_regex }) do
+  scope(constraints: { repository_id: Gitlab::PathRegex.project_git_route_regex }) do
+    scope(module: :repositories) do
+      concerns :gitactionable
+      concerns :lfsable
     end
   end
 
   # Redirect /group/project.wiki.git to the project wiki
-  scope(format: true, constraints: { project_id: Gitlab::PathRegex.project_wiki_git_route_regex, format: :git }) do
+  scope(format: true, constraints: { repository_id: Gitlab::PathRegex.project_wiki_git_route_regex, format: :git }) do
     wiki_redirect = redirect do |params, request|
-      project_id = params[:project_id].delete_suffix('.wiki')
+      project_id = params[:repository_id].delete_suffix('.wiki')
       path = [params[:namespace_id], project_id, 'wikis'].join('/')
       path << "?#{request.query_string}" unless request.query_string.blank?
       path
@@ -47,7 +55,7 @@ scope(path: '*namespace_id/:project_id',
   end
 
   # Redirect /group/project/info/refs to /group/project.git/info/refs
-  scope(constraints: { project_id: Gitlab::PathRegex.project_route_regex }) do
+  scope(constraints: { repository_id: Gitlab::PathRegex.project_route_regex }) do
     # Allow /info/refs, /info/refs?service=git-upload-pack, and
     # /info/refs?service=git-receive-pack, but nothing else.
     #
@@ -58,7 +66,7 @@ scope(path: '*namespace_id/:project_id',
     end
 
     ref_redirect = redirect do |params, request|
-      path = "#{params[:namespace_id]}/#{params[:project_id]}.git/info/refs"
+      path = "#{params[:namespace_id]}/#{params[:repository_id]}.git/info/refs"
       path << "?#{request.query_string}" unless request.query_string.blank?
       path
     end