summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10-8-stable-patch-3' of https://gitlab.com/gitlab-org/gitlab-ce...gitaly-0.100.1-for-10-8-stableJacob Vosmaer2018-05-3039-60/+445
|\
| * Merge branch '10-8-stable-patch-3-fix-conflicts-19196' into '10-8-stable-patc...James Lopez2018-05-303-1/+30
| |\
| | * Fix schema conflictTiago Botelho2018-05-301-4/+0
| | * Merge branch 'ensure-remote-mirror-columns-in-ce' into 'master'Douwe Maan2018-05-303-0/+33
| * | Merge branch 'fix-gitaly-ci-10-8-stable' into '10-8-stable-patch-3'Mayra Cabrera2018-05-306-25/+144
| |\ \
| | * | Fix gitaly-ruby bundle poisoning in CI (10-8-stable)Jacob Vosmaer (GitLab)2018-05-306-25/+144
| |/ /
| * | Merge branch 'update-unicode-display_width-1.3.2' into 'master'Stan Hu2018-05-301-1/+1
| * | Merge branch 'winh-new-merge-request-encoding' into 'master'Mike Greiling2018-05-303-3/+40
| * | Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master'Filipa Lacerda2018-05-304-2/+22
| * | Merge branch 'sh-bump-rugged-to-0.27.1' into 'master'Robert Speicher2018-05-301-1/+1
| * | Merge branch 'workhorse-4.2.1' into 'master'Alessio Caiazza2018-05-301-1/+1
| |/
| * Merge branch 'memoize-database-version' into 'master'Rémy Coutable2018-05-303-1/+20
| * Merge branch 'add-embedded-snippets-docs' into 'master'Achilleas Pipinellis2018-05-301-0/+33
| * Update VERSION to 10.8.2v10.8.2Filipa Lacerda2018-05-281-1/+1
| * Update CHANGELOG.md for 10.8.2Filipa Lacerda2018-05-284-15/+9
| * Merge branch 'security-fj-import-export-assignment-10-8' into 'security-10-8'Mayra Cabrera2018-05-2512-18/+93
| * Merge branch 'security-dm-delete-deploy-key-10-8' into 'security-10-8'Mayra Cabrera2018-05-253-4/+47
| * Merge branch 'security-10-8-users-can-update-their-password-without-entering-...Filipa Lacerda2018-05-253-2/+18
* | Use Gitaly 0.100.1 in 10-8-stableJacob Vosmaer2018-05-251-1/+1
|/
* Update VERSION to 10.8.1v10.8.1Mayra Cabrera2018-05-231-1/+1
* Update CHANGELOG.md for 10.8.1Mayra Cabrera2018-05-2310-45/+15
* Merge branch '10-8-stable-patch-1' into '10-8-stable'Mayra Cabrera2018-05-2364-222/+648
|\
| * Merge branch 'ldap-u2f-fix' into 'master'10-8-stable-patch-1Mike Greiling2018-05-232-0/+8
| * Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master'Douwe Maan2018-05-232-0/+20
| * Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master'Rémy Coutable2018-05-233-26/+54
| * Merge branch '10-8-stable-patch-1-fix-conflict' into '10-8-stable-patch-1'Mayra Cabrera2018-05-233-3/+8
| |\
| | * Fix conflicts in Gemfile and Gemfile.lock10-8-stable-patch-1-fix-conflictStan Hu2018-05-232-12/+0
| | * Merge branch 'sh-bump-prometheus-client-mmap' into 'master'Nick Thomas2018-05-233-0/+17
| * | Merge branch 'ide-commit-state-bug' into 'master'Filipa Lacerda2018-05-232-2/+27
| * | Merge branch 'ide-file-finder-improve-order' into 'master'Filipa Lacerda2018-05-233-7/+14
| |/
| * Merge branch '46381-dropdown-mr-widget-backport' into '10-8-stable-patch-1'Mayra Cabrera2018-05-2212-116/+138
| |\
| | * Fix eslint46381-dropdown-mr-widget-backportFilipa Lacerda2018-05-181-1/+1
| | * Add missing docsFilipa Lacerda2018-05-181-0/+7
| | * Backport of Resolve "Dropdown actions in mini pipeline graph in mr widget don...Filipa Lacerda2018-05-1812-117/+132
| * | Merge branch 'sh-fast-admin-counts' into 'master'Yorick Peterse2018-05-225-10/+127
| * | Merge branch '46177-fix-present-on-generic-commit-status' into 'master'Grzegorz Bizon2018-05-229-25/+61
| * | Merge branch 'docs/46042-document-that-project-templates-can-be-used-with-aut...Achilleas Pipinellis2018-05-221-0/+4
| * | Merge branch 'docker-backup-restore-doc' into 'master'Marin Jankovski2018-05-221-0/+35
| * | Merge branch 'sh-fix-blocked-user-account-ldap' into 'master'Douwe Maan2018-05-223-18/+35
| * | Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into ...Grzegorz Bizon2018-05-223-1/+10
| * | Merge branch 'fix-kube_client-proxy_url-exception' into 'master'Grzegorz Bizon2018-05-224-0/+36
| * | Merge branch '46454-wrong-value-in-ci-deploy-user' into 'master'Kamil Trzciński2018-05-224-3/+8
| * | Merge branch '46498-do-not-modify-strings' into 'master'Stan Hu2018-05-222-11/+11
| * | Merge branch 'docs/incremental-rollouts' into 'master'Achilleas Pipinellis (🌴 May 18 - May 21 🌴)2018-05-225-0/+52
|/ /
* | Update VERSION to 10.8.0v10.8.0Mayra Cabrera2018-05-211-1/+1
* | Update CHANGELOG.md for 10.8.0Mayra Cabrera2018-05-21156-786/+176
* | Update VERSION to 10.8.0-rc13v10.8.0-rc13Filipa Lacerda2018-05-181-1/+1
* | Merge branch '10-8-stable-prepare-rc13' into '10-8-stable'James Lopez2018-05-1815-28/+429
|\ \
| * | Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-1815-28/+429
|/ /
* | Update VERSION to 10.8.0-rc12v10.8.0-rc1210-8-stable-prepare-rc13Mayra Cabrera2018-05-171-1/+1