diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-15 06:53:42 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-04-15 06:53:42 +0000 |
commit | 63b21945d2a6d53c7baa65bffcac33ab5fa8bb91 (patch) | |
tree | 250754a33d53845d5f720d97a7648fd9ebe97eb9 /config/routes.rb | |
parent | 61c79418c46105ecedfca3701b7e4ac9ba6ba601 (diff) | |
parent | 9d00bb08962e26b0c284bcfc5e7ed52cf141d5c6 (diff) | |
download | gitlab-ce-63b21945d2a6d53c7baa65bffcac33ab5fa8bb91.tar.gz |
Merge branch 'google-code-import' into 'master'
Import projects from Google Code.
Resolves #1257.
Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @o9000).
### To do
- [x] List projects from Google Takeout file
- [x] Import Git repository
- [x] Import issues
- [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50)
- [x] Handle deleted attachments
- [x] Handle blockedOn attribute
- [x] Add directions on how to get data from Google Takeout
### Import instructions
![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png)
### Imported issue
![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png)
See merge request !471
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 63eb7d0fe85..5d176590d70 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -81,6 +81,15 @@ Gitlab::Application.routes.draw do get :callback get :jobs end + + resource :google_code, only: [:create, :new], controller: :google_code do + get :status + post :callback + get :jobs + + get :new_user_map, path: :user_map + post :create_user_map, path: :user_map + end end # |