diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-06-30 17:42:42 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-06-30 17:42:42 +0000 |
commit | f7b056167a3dd79dde7b7fdd87209b478975c546 (patch) | |
tree | ffc1169b928504fd718ac64cb42ceda6b67b18d3 /lib/api/projects.rb | |
parent | 82ccc0af475e8db6bf2980ee3524379874294cab (diff) | |
parent | ce6635406c8e2e4d336d6d7738a1e4916036871c (diff) | |
download | gitlab-ce-f7b056167a3dd79dde7b7fdd87209b478975c546.tar.gz |
Merge branch 'ericidema/gitlab-ce-import-with-github-personal-access-tokens' into 'master'
Allow importing from Github using Personal Access Tokens
_Originally opened at !4005 by @ericidema._
------
## What does this MR do?
* Made changes to `Gitlab::GithubImport::Client` so that it can be used with Github Personal Access Tokens without the need for OAuth.
* Added UI to collect Personal Access Token from user.
* Detect if the user has logged in with GitHub and use OAuth to skip the Personal Access Token form.
## Are there points in the code the reviewer needs to double check?
Twin Omnibus MR: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/774
## What are the relevant issue numbers?
Closes #13970.
## Screenshots
### GitHub import is configured

-----
### GitHub import is not configured

-----
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4938
Diffstat (limited to 'lib/api/projects.rb')
0 files changed, 0 insertions, 0 deletions