Merge branch 'github_importer'

Conflicts:
	app/helpers/projects_helper.rb

1 files changed, 8 insertions, 0 deletions

diff --git a/config/routes.rb b/config/routes.rb
index c4df4283cba..245d6185639 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -52,6 +52,14 @@ Gitlab::Application.routes.draw do
   get "/s/:username" => "snippets#user_index", as: :user_snippets, constraints: { username: /.*/ }
 
   #
+  # Github importer area
+  #
+  resource :github_import, only: [:create, :new] do
+    get :status
+    get :callback
+  end
+
+  #
   # Explroe area
   #
   namespace :explore do