diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-13 10:35:16 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-13 10:35:16 -0800 |
| commit | bb1f8b1d8be3d2cfd4467ff78bff875498e1b0e2 (patch) | |
| tree | 53a133b27d59dd6ec4f7e52a347c68ddf914ea21 /config | |
| parent | 9ce7492e58d3a90cfd9a07be6ba5b0f4fafe7bc8 (diff) | |
| parent | ef933a4a962e4ab12c448241ad500e229a569f21 (diff) | |
| download | gitlab-ce-bb1f8b1d8be3d2cfd4467ff78bff875498e1b0e2.tar.gz | |
Merge branch 'github_importer'
Conflicts:
app/helpers/projects_helper.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 8 |
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 |