diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-06 17:32:12 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-06 17:32:12 +0000 |
| commit | d737abc537476bf2b500f550b0c733d22f338cf1 (patch) | |
| tree | 4b865101f1e4eab3ceedd75973098de9f18ac4b6 /config | |
| parent | 0ffd79319ffc06f9ab5dcfce4f20a4da2f739577 (diff) | |
| parent | ee851e58490004f985f914f3cfa715b03cdf4982 (diff) | |
| download | gitlab-ce-d737abc537476bf2b500f550b0c733d22f338cf1.tar.gz | |
Merge branch 'sh-support-bitbucket-server-import' into 'master'
Add support for Bitbucket Server imports
Closes #25393
See merge request gitlab-org/gitlab-ce!20164
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/import.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/routes/import.rb b/config/routes/import.rb index efd0260ff60..3998d977c81 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -24,6 +24,13 @@ namespace :import do get :jobs end + resource :bitbucket_server, only: [:create, :new], controller: :bitbucket_server do + post :configure + get :status + get :callback + get :jobs + end + resource :google_code, only: [:create, :new], controller: :google_code do get :status post :callback |