Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

1 files changed, 6 insertions, 0 deletions

diff --git a/config/routes.rb b/config/routes.rb
index c361684dfe3..b4e1abd2768 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -156,6 +156,12 @@ Rails.application.routes.draw do
       get   :new_user_map,    path: :user_map
       post  :create_user_map, path: :user_map
     end
+
+    resource :gitlab_project, only: [:create, :new], controller: :gitlab_projects do
+      get :status
+      get :callback
+      get :jobs
+    end
   end
 
   #