Stan Hu
9c76a6fa96
Show incompatible projects in Google Code import status
...
Importing a JSON file with only one Subversion project lead to confusion
over whether the system was working. Provide status why these projects
could not be imported directly.
Closes #1531
2015-04-30 06:56:49 -07:00
Douwe Maan
c2f11f3209
Get Gitorious importer to work again.
2015-04-24 23:30:12 +02:00
Dmitriy Zaporozhets
2505300b7b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/import/google_code_controller.rb
2015-04-21 15:36:58 +03:00
Douwe Maan
355e6868a2
Fix redirect when trying to view invalid Google Code import status.
2015-04-21 10:30:07 +02:00
Jeroen van Baarsen
5a4ebfb47a
Fixed the Rails/ActionFilter cop
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
Douwe Maan
dfebcb89e6
Don't save unchanged user map items to the DB.
2015-04-17 13:32:29 +02:00
Douwe Maan
63b21945d2
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 ( ♥️ @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
2015-04-15 06:53:42 +00:00
Douwe Maan
dba63d667d
Allow user map to be specified.
2015-04-14 14:50:56 +02:00
Douwe Maan
e69e430ce7
Allow projects to be imported into namespaces user is master of.
2015-04-06 14:50:43 +02:00
Douwe Maan
17e2310878
Add instructions to Google Code import page.
2015-04-03 16:02:39 +02:00
Douwe Maan
7b5bc32cad
Allow projects to be imported from Google Code.
2015-04-03 15:29:27 +02:00
Douwe Maan
737f322e41
Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace.
2015-03-31 16:34:13 +02:00
Dmitriy Zaporozhets
1065f3d30b
Merge branch 'github-org-repos' into 'master'
...
Fix missing GitHub organisation repositories on import page.
Private repositories belonging to organizations rather than users can't be imported because `client.repos(org.login)` was requesting `/users/:org_login/repos` (which only returns public org repo's), while we need `/orgs/:org_login/repos` (which includes both public and private). The `client.org_repos` method does this.
cc @marin This is a bug in 7.8.x, but I'm not sure if it needs a minor release now or if it can go in 7.9.
See merge request !1683
2015-03-12 17:13:25 +00:00
Douwe Maan
3175438f02
Fix missing GitHub organisation repositories on import page.
2015-03-12 13:47:15 +01:00
Valery Sizov
ed4c7190ed
Fix importers with OCC
2015-03-10 12:23:11 +02:00
Dmitriy Zaporozhets
f438791721
Fix import check for case sensetive namespaces
2015-03-02 23:06:59 -08:00
Dmitriy Zaporozhets
f980827ba6
Merge branch 'fix_gitlab_importer' into 'master'
...
Fix GitLab && Gitorious importers. Hide already imported projects
Fixes #2060
See merge request !1594
2015-02-26 16:57:26 +00:00
Douwe Maan
00c631573f
Fix Gitorious import status page hiding of already added projects.
2015-02-25 15:16:24 +01:00
Valery Sizov
9c6f048795
Fix GitLab importer. Hide already imported projects
2015-02-25 12:18:15 +02:00
Douwe Maan
16c767814a
Re-enable rescuing from Bitbucket OAuth errors.
2015-02-24 15:07:25 +01:00
Douwe Maan
448817c4de
Load public key in initializer.
2015-02-24 15:07:24 +01:00
Douwe Maan
ad6d623234
Add Bitbucket importer.
2015-02-24 15:07:24 +01:00
Marcin Kulik
157b4b4b1f
Add gitorious.org importer
2015-02-20 17:42:58 +00:00
Valery Sizov
b3c90dd514
GitHub importer refactoring
2015-02-05 21:48:21 -08:00
Valery Sizov
1ac20698a5
gitlab.com importer: refactorig
2015-02-05 17:03:43 -08:00
Valery Sizov
592ed8738c
Gitlab.com integration: code folding
2015-02-05 12:50:34 -08:00
Valery Sizov
33349dd549
GitLab.com integration: refactoring
2015-02-05 12:50:34 -08:00