summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-mirror-hard-failed-invites' into 'master'10-6-stable-prepare-rc6Robert Speicher2018-03-162-3/+3
* Merge branch 'ci-lint-dispatcher-fix' into 'master'Filipa Lacerda2018-03-162-0/+1
* Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'Yorick Peterse2018-03-163-49/+110
* Merge branch 'osw-43951-single-batch-blob-request-to-gitaly' into 'master'Sean McGivern2018-03-162-8/+15
* Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-165-46/+142
* Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-1612-216/+313
* Update VERSION to 10.6.0-rc5v10.6.0-rc5Robert Speicher2018-03-141-1/+1
* Merge branch '10-6-stable-prepare-rc5' into '10-6-stable'Robert Speicher2018-03-1469-340/+1497
|\
| * Merge branch '35475-lazy-diff' into 'master'10-6-stable-prepare-rc5Fatih Acet2018-03-148-14/+117
| * Merge branch 'revert-238781a6' into 'master'Robert Speicher2018-03-131-2/+0
| * Merge branch 'pages-0-7-1' into 'master'Robert Speicher2018-03-131-1/+1
| * Merge branch '44024-fix-table-extra-column' into 'master'Clement Ho2018-03-133-2/+10
| * Merge branch '44149-issue-comment-buttons' into 'master'Phil Hughes2018-03-139-7/+135
| * Merge branch '44152l-last-pipeline-link' into 'master'Phil Hughes2018-03-131-4/+2
| * Merge branch 'bvl-inconsistent-spelling-in-mr-form' into 'master'Douwe Maan2018-03-133-20/+90
| * Merge branch 'gitaly-0.89.0' into 'master'Robert Speicher2018-03-131-1/+1
| * Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-133-4/+21
| * Merge branch '44096-update-zaproxy-image-in-auto-devops-template' into 'master'Dmitriy Zaporozhets2018-03-131-1/+1
| * Merge branch 'tc-api-fix-expose_url' into 'master'Stan Hu2018-03-133-1/+47
| * Merge branch 'fix-duplicate-notes' into 'master'Filipa Lacerda2018-03-137-17/+94
| * Merge branch 'add-indexes-to-todos-for-heavy-users-like-sean' into 'master'Yorick Peterse2018-03-133-1/+36
| * Merge branch 'ce-5194-fix-github-ci-cd-github-auth-missing-query-param' into ...Douwe Maan2018-03-131-1/+1
| * Merge branch 'docs-update-table-tiers-boards' into 'master'Achilleas Pipinellis2018-03-131-0/+11
| * Merge branch 'update-templates-and-dependencies-10-6' into 'master'Robert Speicher2018-03-137-200/+357
| * Merge branch 'update-guides-10-6' into 'master'Robert Speicher2018-03-132-2/+363
| * Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-135-34/+65
| * Merge branch 'sh-remove-double-caching-repo-empty' into 'master'Sean McGivern2018-03-133-5/+10
| * Merge branch '43802-ensure-foreign-keys-on-clusters-applications' into 'master'Yorick Peterse2018-03-133-0/+57
| * Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-134-9/+46
| * Merge branch '43259-document-persistent-images-for-autodevops-deployments' in...Achilleas Pipinellis2018-03-131-0/+12
| * Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-134-14/+20
|/
* Update VERSION to 10.6.0-rc4v10.6.0-rc4Filipa Lacerda2018-03-121-1/+1
* Merge branch '10-6-stable-frozen' into '10-6-stable'Robert Speicher2018-03-12246-1315/+4304
|\
| * Merge branch '10-6-stable' into 10-6-stable-frozen10-6-stable-frozenJames Lopez2018-03-121-0/+42
| |\
| * | Merge branch 'sh-fix-update-service' into 'master'James Lopez2018-03-082-1/+10
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 10-6-stable-frozenJames Lopez2018-03-08256-1375/+4460
| |\ \
| | * \ Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-0811-15/+98
| | |\ \
| | | * | Hides Triggers if integration only has one eventJames Edwards-Jones2018-03-084-2/+54
| | | * | Service integration displays validation errors on test failJames Edwards-Jones2018-03-073-13/+29
| | | * | Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-075-0/+15
| | * | | Merge branch 'unassign-when-leaving' into 'master'Robert Speicher2018-03-087-116/+95
| | |\ \ \
| | | * | | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-077-116/+95
| | * | | | Merge branch 'bvl-port-ee-improvements-from-maintainer-push' into 'master'Douwe Maan2018-03-086-18/+32
| | |\ \ \ \
| | | * | | | Validate `:push_code` before checking protected branchesbvl-port-ee-improvements-from-maintainer-pushBob Van Landuyt2018-03-081-6/+3
| | | * | | | Address frontend feedbackBob Van Landuyt2018-03-085-12/+29
| | |/ / / /
| | * | | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda2018-03-076-32/+60
| | |\ \ \ \
| | | * | | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontendJose Ivan Vargas2018-03-076-32/+60
| | * | | | | Merge branch 'da-update-project-activity' into 'master'Stan Hu2018-03-072-1/+13
| | |\ \ \ \ \
| | | * | | | | Update project activity when pushing to a wiki repositoryda-update-project-activityDouglas Barbosa Alexandre2018-03-072-1/+13
| | * | | | | | Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-0711-59/+194
| | |\ \ \ \ \ \