summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Fix MembersHelperDouglas Barbosa Alexandre2016-12-161-11/+11
| | | | |
| | * | | Add CHANGELOG entryDouglas Barbosa Alexandre2016-12-161-0/+4
| | | | |
| | * | | Adds sort dropdown for group membersNur Rony2016-12-168-26/+127
| | | | |
| * | | | Merge branch 'fix/keep-compatility-ruby-21' into 'master' Stan Hu2016-12-161-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1 See merge request !8153
| | * | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1fix/keep-compatility-ruby-21Douglas Barbosa Alexandre2016-12-161-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'bitbucket-oauth2' into 'master' Douglas Barbosa Alexandre2016-12-1656-539/+1271
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1Douglas Barbosa Alexandre2016-12-164-10/+10
| | | | |
| | * | | Fix import issues methodDouglas Barbosa Alexandre2016-12-161-4/+4
| | | | |
| | * | | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-16588-1818/+15074
| | |\ \ \
| | * | | | Fix rubucop offensesbitbucket-oauth2Douglas Barbosa Alexandre2016-12-162-28/+27
| | | | | |
| | * | | | BB importer: Fix documantationValery Sizov2016-12-161-5/+3
| | | | | |
| | * | | | BB importer: Adressed more review commentsValery Sizov2016-12-162-15/+23
| | | | | |
| | * | | | Use new generic image for project importAchilleas Pipinellis2016-12-164-2/+2
| | | | | |
| | * | | | Merge branch 'bitbucket-oauth2' of gitlab.com:gitlab-org/gitlab-ce into ↵Achilleas Pipinellis2016-12-161-6/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | bitbucket-oauth2
| | | * \ \ \ Merge branch 'bitbucket-oauth2' of gitlab.com:gitlab-org/gitlab-ce into ↵Valery Sizov2016-12-160-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bitbucket-oauth2
| | | * | | | | BB importer: address review commentValery Sizov2016-12-162-7/+5
| | | | | | | |
| | | * | | | | BB importer: Milestone importerValery Sizov2016-12-163-0/+12
| | | | | | | |
| | * | | | | | Refactor Bitbucket import docsAchilleas Pipinellis2016-12-1612-25/+59
| | | |/ / / / | | |/| | | |
| | * | | | | BB importer: Milestone importerValery Sizov2016-12-163-0/+12
| | |/ / / /
| | * | | | BB importer: Added note about linking BB users and GitLab users[ci skip]Valery Sizov2016-12-161-1/+2
| | | | | |
| | * | | | BB importer: Fixed bug with putting expired token to a project.clone_urlValery Sizov2016-12-154-5/+8
| | | | | |
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-1485-211/+1346
| | |\ \ \ \
| | * | | | | BB importer: fix specsValery Sizov2016-12-146-12/+15
| | | | | | |
| | * | | | | BB importer: More advanced error handlingValery Sizov2016-12-141-33/+47
| | | | | | |
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-14912-6654/+15609
| | |\ \ \ \ \
| | * | | | | | BB importer: Refactoring user importing logic[ci skip]Valery Sizov2016-12-146-22/+14
| | | | | | | |
| | * | | | | | Fix BB authentication[ci skip]Valery Sizov2016-12-141-6/+2
| | | | | | | |
| | * | | | | | BB importer: Adding created_by only when used is not found[ci skip]Valery Sizov2016-12-136-10/+29
| | | | | | | |
| | * | | | | | BB importer: Fixed after code review[ci skip]Valery Sizov2016-12-133-1/+7
| | | | | | | |
| | * | | | | | specs for bitbucket representersValery Sizov2016-12-126-3/+160
| | | | | | | |
| | * | | | | | Spec for Bitbucket::PaginatorValery Sizov2016-12-121-0/+21
| | | | | | | |
| | * | | | | | Spec for bitbucket pageValery Sizov2016-12-122-0/+51
| | | | | | | |
| | * | | | | | Specs for Bitbucket::Connections and Bitbucket::CollectionsValery Sizov2016-12-125-15/+60
| | | | | | | |
| | * | | | | | Fix query for importing all projects for memberStan Hu2016-12-091-1/+1
| | | | | | | |
| | * | | | | | Return repositories to which user is a member, not just ownerStan Hu2016-12-091-1/+1
| | | | | | | |
| | * | | | | | Fix specsValery Sizov2016-12-092-6/+14
| | | | | | | |
| | * | | | | | Fix rubocop[ci skip]Valery Sizov2016-12-091-4/+4
| | | | | | | |
| | * | | | | | Handling OAuth2 errorsValery Sizov2016-12-091-1/+1
| | | | | | | |
| | * | | | | | Update documentation for BitBucketValery Sizov2016-12-082-92/+7
| | | | | | | |
| | * | | | | | BitBucket importer: import issues with labelsValery Sizov2016-12-072-0/+26
| | | | | | | |
| | * | | | | | Remove outdated bitbucket_import.rbValery Sizov2016-12-071-6/+0
| | | | | | | |
| | * | | | | | BitBucket refactoring. Iteration 3Valery Sizov2016-12-074-21/+15
| | | | | | | |
| | * | | | | | BitBuckpet importer. Refactoring. Iteration 2Valery Sizov2016-12-077-20/+18
| | | | | | | |
| | * | | | | | Apply review comments. Iteration 1Valery Sizov2016-12-077-29/+26
| | | | | | | |
| | * | | | | | Fix authorization with BitBucketValery Sizov2016-12-061-1/+1
| | | | | | | |
| | * | | | | | Fix importing PRs with not existing branchesValery Sizov2016-12-062-3/+3
| | | | | | | |
| | * | | | | | Fix importing inline comment for any diff typeValery Sizov2016-12-061-2/+2
| | | | | | | |
| | * | | | | | Fix inline comment importing for 1:1 diff typeValery Sizov2016-12-052-8/+20
| | | | | | | |
| | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-301124-5484/+8385
| | |\ \ \ \ \ \
| | * | | | | | | Fix spec for Bitbucket importerStan Hu2016-11-212-4/+4
| | | | | | | | |