summaryrefslogtreecommitdiff
path: root/app/controllers/import
Commit message (Collapse)AuthorAgeFilesLines
* Use fixed version of fogbugz gemJared Szechy2015-09-151-5/+3
| | | | This allows us to properly handle authentication errors.
* FogBugz project importJared Szechy2015-09-081-0/+106
|
* Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-233-19/+36
| | | | | | | | | | | | | | | | | | | | | | | and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871
* Import sources: show only enabled sourcesArtem Sidorenko2015-08-202-0/+10
|
* Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-0/+1
| | | | See #1871
* Fix bug causing Bitbucket importer to crash when OAuth application had been ↵bitbucket-re-authorizeDouwe Maan2015-07-281-0/+1
| | | | removed.
* Show incompatible projects in Google Code import statusStan Hu2015-04-301-0/+1
| | | | | | | | 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
* Get Gitorious importer to work again.fix-gitorious-importerDouwe Maan2015-04-241-1/+1
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-211-1/+1
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/import/google_code_controller.rb
| * Fix redirect when trying to view invalid Google Code import status.Douwe Maan2015-04-211-1/+1
| |
* | Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-204-16/+16
|/ | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Don't save unchanged user map items to the DB.Douwe Maan2015-04-171-0/+5
|
* Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-151-0/+111
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Allow user map to be specified.Douwe Maan2015-04-141-2/+50
| |
| * Add instructions to Google Code import page.Douwe Maan2015-04-031-3/+3
| |
| * Allow projects to be imported from Google Code.Douwe Maan2015-04-031-0/+63
| |
* | Allow projects to be imported into namespaces user is master of.Douwe Maan2015-04-061-1/+1
|/
* Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user ↵Douwe Maan2015-03-313-3/+12
| | | | into current namespace.
* Merge branch 'github-org-repos' into 'master'Dmitriy Zaporozhets2015-03-121-1/+1
|\ | | | | | | | | | | | | | | | | | | 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
| * Fix missing GitHub organisation repositories on import page.Douwe Maan2015-03-121-1/+1
| |
* | Fix importers with OCCValery Sizov2015-03-101-10/+8
|/
* Fix import check for case sensetive namespacesDmitriy Zaporozhets2015-03-021-1/+1
|
* Merge branch 'fix_gitlab_importer' into 'master'Dmitriy Zaporozhets2015-02-262-2/+2
|\ | | | | | | | | | | | | | | Fix GitLab && Gitorious importers. Hide already imported projects Fixes #2060 See merge request !1594
| * Fix Gitorious import status page hiding of already added projects.Douwe Maan2015-02-251-1/+1
| |
| * Fix GitLab importer. Hide already imported projectsValery Sizov2015-02-251-1/+1
| |
* | Re-enable rescuing from Bitbucket OAuth errors.Douwe Maan2015-02-241-1/+1
| |
* | Load public key in initializer.Douwe Maan2015-02-243-0/+15
| |
* | Add Bitbucket importer.Douwe Maan2015-02-241-0/+74
|/
* Add gitorious.org importerMarcin Kulik2015-02-201-0/+43
|
* GitHub importer refactoringValery Sizov2015-02-051-15/+7
|
* gitlab.com importer: refactorigValery Sizov2015-02-053-33/+30
|
* Gitlab.com integration: code foldingValery Sizov2015-02-052-3/+3
|
* GitLab.com integration: refactoringValery Sizov2015-02-052-0/+149
View Lorry Controller Status