summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.5.8v10.5.810-5-stableMayra Cabrera2018-04-241-1/+1
* Update CHANGELOG.md for 10.5.8Mayra Cabrera2018-04-242-5/+7
* Merge branch 'sh-fix-recaptcha-test' into 'master'Stan Hu2018-04-242-4/+1
* Merge branch '10-5-security_issue_42029' into 'security-10-5'Phil Hughes2018-04-244-2/+18
* Merge branch 'sh-downgrade-mysql-ci' into 'master'Robert Speicher2018-04-201-1/+1
* Update VERSION to 10.5.7v10.5.7Filipa Lacerda2018-04-031-1/+1
* Update CHANGELOG.md for 10.5.7Filipa Lacerda2018-04-033-10/+8
* Merge branch 'jej/mattermost-notification-confidentiality-10-5' into 'securit...Douwe Maan2018-04-0335-22/+504
* Merge branch '42028-xss-diffs' into 'security-10-5'Douwe Maan2018-04-033-4/+38
* Merge branch 'fl-fix-milestone-bug' into 'security-10-5'Phil Hughes2018-04-032-4/+22
* Update VERSION to 10.5.6v10.5.6Mark Fletcher2018-03-161-1/+1
* Update CHANGELOG.md for 10.5.6Mark Fletcher2018-03-163-10/+8
* Merge branch '10-5-stable-patch-6' into '10-5-stable'Mark Fletcher2018-03-1647-129/+542
|\
| * Merge branch 'fix/auth0-unsafe-login-10-5' into 'security-10-5'James Lopez2018-03-168-50/+134
| * Merge branch 'fj-15329-services-callbacks-ssrf-10-5' into 'security-10-5'Douwe Maan2018-03-1639-79/+408
|/
* Update VERSION to 10.5.5v10.5.5Ian Baum2018-03-151-1/+1
* Update CHANGELOG.md for 10.5.5Ian Baum2018-03-156-25/+14
* Merge branch '10-5-stable-patch-5' into '10-5-stable'Ian Baum2018-03-1518-100/+306
|\
| * Merge branch 'sh-remove-double-caching-repo-empty' into 'master'10-5-stable-patch-5Sean McGivern2018-03-153-5/+10
| * Resolve conflicts in namespace_spec.rbMichael Kozono2018-03-151-107/+40
| * Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-155-30/+214
| * Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-153-4/+21
| * Merge branch 'sh-add-missing-acts-as-taggable-indices' into 'master'Yorick Peterse2018-03-153-0/+28
| * Merge branch 'sh-add-section-name-index' into 'master'Yorick Peterse2018-03-153-1/+29
| * Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'Phil Hughes2018-03-152-10/+21
|/
* Update VERSION to 10.5.4v10.5.4Ian Baum2018-03-081-1/+1
* Update CHANGELOG.md for 10.5.4Ian Baum2018-03-0813-61/+21
* Merge branch '10-5-stable-patch-4' into '10-5-stable'Ian Baum2018-03-0855-397/+845
|\
| * Fix rubocop error with features/steps/project/pages.rb10-5-stable-patch-4Ian Baum2018-03-071-1/+1
| * Fix pages spinach failureKamil Trzciński2018-03-071-1/+1
| * Merge branch '42877-for-10-5-stable-patch-4' into '10-5-stable-patch-4'Ian Baum2018-03-071-3/+0
| |\
| | * Fix snippets problem in 10-5-stable-patch-4Andreas Brandl2018-03-071-3/+0
| |/
| * Merge branch 'fix/sm/fix_pages_worker' into 'master'Kamil Trzciński2018-03-074-14/+44
| * Revert "Merge branch 'fix/sm/fix_pages_worker' into 'master'"Ian Baum2018-03-075-94/+14
| * Merge branch 'backport-ee-5049-to-ce' into 'master'Douwe Maan2018-03-071-2/+15
| * Merge branch 'fix/sm/fix_pages_worker' into 'master'Kamil Trzciński2018-03-065-14/+94
| * Merge branch '42877-fix-visibility-change-performance' into 'master'Yorick Peterse2018-03-065-40/+77
| * Merge branch 'remove-projects-finder-from-todos-finder' into 'master'Sean McGivern2018-03-062-9/+11
| * Merge branch 'an/lograge-fix' into 'master'Stan Hu2018-03-061-1/+6
| * Merge branch '43531-500-error-searching-wiki-incompatible-character-encodings...Nick Thomas2018-03-063-1/+35
| * Merge branch '43532-error-on-admin-applications-prometheus-template' into 'ma...Stan Hu2018-03-065-26/+77
| * Merge branch '43261-fix-prometheus-installation' into 'master'Kamil Trzciński2018-03-062-0/+8
| * Merge branch 'issue-edit-shortcut' into 'master'Filipa Lacerda2018-03-063-4/+20
| * Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'Douwe Maan2018-03-065-5/+23
| * Merge branch 'minimal-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-03-063-18/+63
| * Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' i...Grzegorz Bizon2018-03-068-59/+108
| * Merge branch 'grpc-unavailable-restart' into 'master'Douwe Maan2018-03-067-131/+250
| * Merge branch 'zj-gitaly-encoding-issue' into 'master'Robert Speicher2018-03-063-52/+73
| * Merge branch '43299-revert-bad-merge' into 'master'Phil Hughes2018-03-062-33/+36
|/
* Merge branch '10-5-stable' of gitlab.com:gitlab-org/gitlab-ce into dev-10-5-s...James Lopez2018-03-061-1/+1
|\