Merge branch 'bitbucket-oauth2' into 'master'
Refactor Bitbucket importer to use BitBucket API Version 2 ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19946 ## Screenshots (if relevant) This MR needs the following permissions in the Bitbucket OAuth settings: ![image](/uploads/a26ae5e430a724bf581a92da7028ce3c/image.png) - [] ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] 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) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5995
Showing
... | @@ -22,7 +22,6 @@ gem 'doorkeeper', '~> 4.2.0' | ... | @@ -22,7 +22,6 @@ gem 'doorkeeper', '~> 4.2.0' |
gem 'omniauth', '~> 1.3.1' | gem 'omniauth', '~> 1.3.1' | ||
gem 'omniauth-auth0', '~> 1.4.1' | gem 'omniauth-auth0', '~> 1.4.1' | ||
gem 'omniauth-azure-oauth2', '~> 0.0.6' | gem 'omniauth-azure-oauth2', '~> 0.0.6' | ||
gem 'omniauth-bitbucket', '~> 0.0.2' | |||
gem 'omniauth-cas3', '~> 1.1.2' | gem 'omniauth-cas3', '~> 1.1.2' | ||
gem 'omniauth-facebook', '~> 4.0.0' | gem 'omniauth-facebook', '~> 4.0.0' | ||
gem 'omniauth-github', '~> 1.1.1' | gem 'omniauth-github', '~> 1.1.1' | ||
... | ... |
![doc/integration/img/bitbucket_oauth_settings_page.png](https://gitcode.net/lshemail/gitlab-foss/-/raw/12a7e717d7b9fdd265d54a9c5bd07394e304b187/doc/integration/img/bitbucket_oauth_settings_page.png)
| W: | H:
| W: | H:
![doc/integration/img/bitbucket_oauth_settings_page.png](https://gitcode.net/lshemail/gitlab-foss/-/raw/12a7e717d7b9fdd265d54a9c5bd07394e304b187/doc/integration/img/bitbucket_oauth_settings_page.png)
![doc/integration/img/bitbucket_oauth_settings_page.png](https://gitcode.net/lshemail/gitlab-foss/-/raw/12a7e717d7b9fdd265d54a9c5bd07394e304b187/doc/integration/img/bitbucket_oauth_settings_page.png)
29.4 KB
16.1 KB
45.5 KB
14.9 KB
7.1 KB
1.3 KB
10.8 KB
![doc/workflow/importing/img/import_projects_from_github_select_auth_method.png](https://gitcode.net/lshemail/gitlab-foss/-/raw/12a7e717d7b9fdd265d54a9c5bd07394e304b187/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png)
| W: | H:
| W: | H:
![doc/workflow/importing/img/import_projects_from_github_select_auth_method.png](https://gitcode.net/lshemail/gitlab-foss/-/raw/12a7e717d7b9fdd265d54a9c5bd07394e304b187/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png)
![doc/workflow/importing/img/import_projects_from_github_select_auth_method.png](https://gitcode.net/lshemail/gitlab-foss/-/raw/12a7e717d7b9fdd265d54a9c5bd07394e304b187/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png)
36.0 KB
lib/bitbucket/client.rb
0 → 100644
lib/bitbucket/collection.rb
0 → 100644
lib/bitbucket/connection.rb
0 → 100644
lib/bitbucket/page.rb
0 → 100644
lib/bitbucket/paginator.rb
0 → 100644
spec/lib/bitbucket/page_spec.rb
0 → 100644