Commit Graph

29 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 5533fd17d8
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-08 17:43:19 +03:00
Andrew Smith 9a9e22a88c
Rename `gl_user_id` to `gitlab_user_id` in importer classes 2016-09-08 11:57:22 +10:00
James Lopez 3111d6a9cc Fixed gitlab.com importer missing confidential attribute 2016-09-05 17:41:48 +02:00
James Lopez 37e363c9cf fixed similar issue with gitlab.com importer because why not! 2016-07-14 17:06:48 +02:00
Douglas Barbosa Alexandre a14ee9bef9 Keeps issue number when importing from Gitlab.com
With these changes we don’t lost the issue references when importing
from `GitLab.com`.
2016-07-13 11:35:38 -03:00
James Lopez 9ecebaaea1 adding notifications stuff and more refactoring for exporting projects 2016-06-14 16:31:03 +02:00
James Lopez 3f7ed55011 lots of refactoring to reuse import service 2016-06-14 12:47:07 +02:00
James Lopez 903da37755 WIP - starting refactoring import/export to use services 2016-06-13 20:35:57 +02:00
Felipe Artur 56f3b243ce Add leading comment space cop 2016-05-31 19:33:46 -03:00
James Lopez bf484ffee4 fix bad refactoring of import data credentials 2016-05-26 11:25:35 +02:00
James Lopez 4e9ce5abe2 fix typo from bad refactoring 2016-05-17 15:19:59 +02:00
James Lopez 5e51fce4dc some refactoring to symbolise keys across importers and left a TODO 2016-04-05 15:41:15 +02:00
James Lopez 255cd31652 fixes after more import testing 2016-04-01 17:27:07 +02:00
James Lopez c136edbbe3 fix gitlab import and spec 2016-03-22 18:03:54 +01:00
Kazuki Sawada fc170baf3f Fix import from gitlab.com
Fixes #12652
2016-03-02 10:35:44 +01:00
Jason Lee 932a247f5f Use CGI.escape instead of URI.escape, because URI is obsoleted.
ref: 238b979f17
2016-01-12 18:20:03 +08:00
Gabriel Mazetto b5291f9599 Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Stan Hu 2e9c922dd1 Fix bug where only the first 15 Bitbucket issues would be imported.
Also fix a number of issues where author/reporter names were not available.
2015-09-01 08:50:20 -07:00
Stan Hu ed1d4fa477 Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab
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
2015-08-23 09:23:44 -07:00
Douwe Maan 99abbe7dbe Use Projects::CreateService to create imported projects so hooks are executed. 2015-04-06 14:51:09 +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
Stan Hu 5cce0645b0 Fix OAuth2 issue importing a new project from GitHub and GitLab
Closes #1268
2015-03-22 18:16:48 -07:00
Douwe Maan 2718955441 Fix import pages not working after first load. 2015-03-13 13:47:26 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Valery Sizov 1ac20698a5 gitlab.com importer: refactorig 2015-02-05 17:03:43 -08:00
Valery Sizov 33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 7ddba92a39 Gitlab integration: added tests 2015-02-05 12:50:34 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00