summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/ldap_wihtout_user' into 'master'cherry-pick-ab8f13c3Douwe Maan2018-03-296-22/+28
* Update VERSION to 10.6.1v10.6.1Filipa Lacerda2018-03-271-1/+1
* Update CHANGELOG.md for 10.6.1Filipa Lacerda2018-03-276-25/+20
* Merge branch '10-6-stable-patch-1' into '10-6-stable'James Lopez2018-03-272-1/+6
|\
| * Merge branch 'bug/44103-ie11-compatibility' into 'master'10-6-stable-patch-1Fatih Acet2018-03-261-0/+1
| * Merge branch 'docs/rs-update-changelog' into 'master'Douwe Maan2018-03-261-1/+5
|/
* Merge branch '10-6-stable-patch-1' into '10-6-stable'Robert Speicher2018-03-2331-60/+957
|\
| * Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut...Stan Hu2018-03-237-17/+73
| * Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-232-1/+6
| * Merge branch 'sh-update-loofah' into 'master'Robert Speicher2018-03-233-5/+12
| * Merge branch 'docs/ci-caching' into 'master'Marcia Ramos2018-03-234-22/+702
| * Merge branch 'fix-ci-job-auto-retry' into 'master'Grzegorz Bizon2018-03-233-1/+39
| * Merge branch 'ee-5063-to-ce-backport' into 'master'Douwe Maan2018-03-233-5/+5
| * Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master'Yorick Peterse2018-03-233-1/+48
| * Merge branch 'jramsay-maintainers-can-edit-docs' into 'master'Marcia Ramos2018-03-231-4/+9
| * Merge branch 'update-cloud-native-chart-docs' into 'master'Marcia Ramos2018-03-231-2/+2
| * Merge branch '44232-docs-for-runner-ip-address' into 'master'Kamil Trzciński2018-03-234-0/+38
| * Merge branch 'fix/sm/erase_old_trace' into 'master'Kamil Trzciński2018-03-232-2/+23
* | Update VERSION to 10.6.0v10.6.0James Lopez2018-03-221-1/+1
* | Update CHANGELOG.md for 10.6.0James Lopez2018-03-22170-845/+184
|/
* Merge branch 'sh-lograge-strip-location-header' into 'master'Robert Speicher2018-03-211-0/+18
* 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
|/