-
- Downloads
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:  - [] ## 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
No related branches found
No related tags found
Showing
- Gemfile 0 additions, 1 deletionGemfile
- Gemfile.lock 0 additions, 5 deletionsGemfile.lock
- app/controllers/application_controller.rb 1 addition, 1 deletionapp/controllers/application_controller.rb
- app/controllers/import/bitbucket_controller.rb 47 additions, 36 deletionsapp/controllers/import/bitbucket_controller.rb
- app/views/import/bitbucket/status.html.haml 28 additions, 17 deletionsapp/views/import/bitbucket/status.html.haml
- changelogs/unreleased/bitbucket-oauth2.yml 4 additions, 0 deletionschangelogs/unreleased/bitbucket-oauth2.yml
- config/initializers/omniauth.rb 6 additions, 0 deletionsconfig/initializers/omniauth.rb
- config/initializers/public_key.rb 0 additions, 2 deletionsconfig/initializers/public_key.rb
- doc/README.md 1 addition, 1 deletiondoc/README.md
- doc/integration/bitbucket.md 14 additions, 101 deletionsdoc/integration/bitbucket.md
- doc/integration/img/bitbucket_oauth_settings_page.png 0 additions, 0 deletionsdoc/integration/img/bitbucket_oauth_settings_page.png
- doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.png 0 additions, 0 deletions...ting/bitbucket_importer/bitbucket_import_grant_access.png
- doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.png 0 additions, 0 deletions...rting/bitbucket_importer/bitbucket_import_new_project.png
- doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.png 0 additions, 0 deletions.../bitbucket_importer/bitbucket_import_select_bitbucket.png
- doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png 0 additions, 0 deletions...ng/bitbucket_importer/bitbucket_import_select_project.png
- doc/workflow/importing/img/bitbucket_import_grant_access.png 0 additions, 0 deletionsdoc/workflow/importing/img/bitbucket_import_grant_access.png
- doc/workflow/importing/img/bitbucket_import_new_project.png 0 additions, 0 deletionsdoc/workflow/importing/img/bitbucket_import_new_project.png
- doc/workflow/importing/img/bitbucket_import_select_project.png 0 additions, 0 deletions...orkflow/importing/img/bitbucket_import_select_project.png
- doc/workflow/importing/img/import_projects_from_github_new_project_page.png 0 additions, 0 deletions...ting/img/import_projects_from_github_new_project_page.png
- doc/workflow/importing/img/import_projects_from_github_select_auth_method.png 0 additions, 0 deletions...ng/img/import_projects_from_github_select_auth_method.png
Loading
Please register or sign in to comment