summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ignore vendor/gitaly-rubyfix-gitaly-ci-10-8-stableJacob Vosmaer2018-05-301-0/+1
* Fix gitaly-ruby bundle poisoning in CIJacob Vosmaer (out of office May 10-14)2018-05-305-25/+143
* 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
* 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
* | Merge branch '10-8-stable-prepare-rc12' into '10-8-stable'Mayra Cabrera2018-05-177-6/+19
|\ \ | |/ |/|
| * Merge branch 'sh-remove-deprecation-warnings-from-com' into 'master'Mayra Cabrera2018-05-171-2/+6
| * Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'Clement Ho2018-05-173-2/+8
| * Merge branch 'osw-fix-boards-list-header-color' into 'master'Robert Speicher2018-05-173-2/+5
* | Merge branch '10-8-stable-revert' into '10-8-stable'Mayra Cabrera2018-05-176-13/+4
|\ \
| * | Revert "Merge branch 'osw-fix-boards-list-header-color' into 'master'"10-8-stable-revertFilipa Lacerda2018-05-173-5/+2
| * | Revert "Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'"Filipa Lacerda2018-05-173-8/+2
|/ /
* | Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'Clement Ho2018-05-173-2/+8
* | Merge branch 'osw-fix-boards-list-header-color' into 'master'Robert Speicher2018-05-173-2/+5
|/
* Update VERSION to 10.8.0-rc11v10.8.0-rc11Mayra Cabrera2018-05-161-1/+1
* Merge branch '10-8-stable-prepare-rc11' into '10-8-stable'Mayra Cabrera2018-05-162-4/+8
|\
| * Merge branch 'fix-metrics-doorkeeper' into 'master'Nick Thomas2018-05-162-4/+8
|/