summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.6.0-rc7v10.6.0-rc7James Lopez2018-03-201-1/+1
* Merge branch '10-6-stable-prepare-rc7' into '10-6-stable'Robert Speicher2018-03-1952-326/+730
|\
| * Merge branch 'jl-add-custom-metrics-docs' into 'master'Marcia Ramos2018-03-191-13/+17
| * Merge branch '44330-docs-for-ingress-ip' into 'master'Achilleas Pipinellis2018-03-192-0/+34
| * Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master'Robert Speicher2018-03-192-0/+11
| * Merge branch 'sh-fix-failure-project-destroy' into 'master'Robert Speicher2018-03-192-1/+10
| * Merge branch 'profile-notifications-dropdown-fix' into 'master'Filipa Lacerda2018-03-192-1/+8
| * Merge branch 'update_vendored_gitlab_ci_yml' into 'master'Robert Speicher2018-03-191-6/+5
| * Merge branch 'gitaly-0.91.0' into 'master'Robert Speicher2018-03-191-1/+1
| * Merge branch 'docs-update_code_quality_example' into 'master'Achilleas Pipinellis2018-03-191-7/+15
| * Merge branch 'sh-optimize-admin-projects-page' into 'master'Robert Speicher2018-03-192-2/+6
| * Merge branch 'fix-dropzone-project-show' into 'master'Jacob Schatz2018-03-193-4/+45
| * Merge branch 'sh-cache-table-exists' into 'master'Yorick Peterse2018-03-194-1/+23
| * Merge branch 'sh-cache-column-exists' into 'master'Yorick Peterse2018-03-194-3/+23
| * Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'Kamil TrzciƄski2018-03-196-7/+55
| * Merge branch '43928-merge-request-comment-gets-cleared-once-the-previous-comm...Filipa Lacerda2018-03-191-7/+3
| * Merge remote-tracking branch 'dev/10-6-stable' into 10-6-stable-prepare-rc7James Lopez2018-03-1957-252/+557
| |\ | |/ |/|
* | Update VERSION to 10.6.0-rc6v10.6.0-rc6Robert Speicher2018-03-181-1/+1
* | Merge branch '10-6-stable-rc6-critical' into '10-6-stable'Robert Speicher2018-03-1659-300/+666
|\ \
| * | Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez2018-03-169-55/+134
| * | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-1639-79/+408
| * | Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'Yorick Peterse2018-03-163-49/+110
| * | Revert "Merge branch '35475-lazy-diff' into 'master'"James Lopez2018-03-168-117/+14
|/ /
| * 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