summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Merge branch 'grapify-projects-api' into 'master' Rémy Coutable2016-11-304-358/+288
| |\ | | | | | | | | | | | | | | | | | | Grapify the projects API Related to #22928 See merge request !7456
| | * Grapify the projects APIgrapify-projects-apiRobert Schilling2016-11-284-358/+288
| | |
| * | Merge branch '25031-do-not-raise-error-in-autocomplete' into 'master' Rémy Coutable2016-11-303-1/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not raise error in AutocompleteController#users when not authorized Closes #25031 See merge request !7817
| | * | Do not raise error in AutocompleteController#users when not authorizedSemyon Pupkov2016-11-303-1/+14
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/25031
| * | | Merge branch 'rs-group-security-spec-speed' into 'master' Rémy Coutable2016-11-304-219/+181
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up Group security access specs This is the Group equivalent of 13ad9a745a392e0bf0cedd0e1f318c1acee9b969 See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See merge request !7813
| | * | | Speed up Group security access specsrs-group-security-spec-speedRobert Speicher2016-11-304-219/+181
| | | | | | | | | | | | | | | | | | | | This is the Group equivalent of 13ad9a745a392e0bf0cedd0e1f318c1acee9b969
| * | | | Merge branch 'fix/create-pipeline-with-builds-in-transaction' into 'master' Kamil Trzciński2016-11-305-95/+108
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create pipeline along with builds in the transation ## What does this MR do? This MR makes it possible to create pipeline along with all associated builds in the transaction, to avoid having empty pipelines when asynchronous job gets terminated. This will simplify implementation of `PipelineUnlockWorker` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6988 and improve reliability of the CI as a whole. ## What are the relevant issue numbers? Related to #24361 See merge request !7742
| | * | | | Extend pipelines factory with transient config attributefix/create-pipeline-with-builds-in-transactionGrzegorz Bizon2016-11-272-14/+9
| | | | | |
| | * | | | Improve readability in pipeline test objects factoryGrzegorz Bizon2016-11-251-6/+10
| | | | | |
| | * | | | Remove pipeline factory that is not used in testsGrzegorz Bizon2016-11-251-6/+0
| | | | | |
| | * | | | Restore method that ensures builds being createdGrzegorz Bizon2016-11-253-21/+52
| | | | | |
| | * | | | Add Changelog entry for pipeline creation improvementsGrzegorz Bizon2016-11-251-0/+4
| | | | | |
| | * | | | Remove remaining calls to CI yaml in pipeline specsGrzegorz Bizon2016-11-251-5/+0
| | | | | |
| | * | | | Move helpers to the end of process pipeline specsGrzegorz Bizon2016-11-251-29/+29
| | | | | |
| | * | | | Update pipeline processing specs for creating buildsGrzegorz Bizon2016-11-251-35/+28
| | | | | |
| | * | | | Create pipeline along with builds in the transationGrzegorz Bizon2016-11-242-12/+9
| | | | | |
| * | | | | Merge branch 'fix/rename-merge-request-head-pipeline' into 'master' Kamil Trzciński2016-11-3012-39/+56
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `MergeRequest#pipeline` to `head_pipeline` ## What does this MR do? This MR renames `MergeRequest#pipeline` to `MergeRequest#head_pipeline` ## Does this MR meet the acceptance criteria? - [x] All builds are passing ## What are the relevant issue numbers? Closes #24810 See merge request !7783
| | * | | | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-2912-39/+56
| | | | | | |
| * | | | | | Merge branch 'patch-1' into 'master' Sean McGivern2016-11-301-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite an HTTP link to use HTTPS See merge request !7834
| | * | | | | | Rewrite an HTTP link to use HTTPSAlex Jordan2016-11-291-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'fix/ca-no-date' into 'master' Douwe Maan2016-11-305-6/+68
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for builds with no start date throwing an error in cycle analytics events Instead of the error, we should inform that there is no start date - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24925 See merge request !7738
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/fix/ca-no-date' into fix/ca-no-datefix/ca-no-dateJames Lopez2016-11-291-4/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Show dashes when date is emptyAlfredo Sumaran2016-11-281-4/+9
| | | | | | | | | |
| | * | | | | | | | fix started_at checkJames Lopez2016-11-291-5/+1
| | |/ / / / / / /
| | * | | | | | | fix rubocop warningJames Lopez2016-11-251-1/+1
| | | | | | | | |
| | * | | | | | | use an empty total time when the build has not started yet so the UI knowsJames Lopez2016-11-253-3/+29
| | | | | | | | |
View Lorry Controller Status