summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge branch 'fix-tags-10-5' into '10-5-stable'Robert Speicher2018-03-051-1/+1
| |\
| | * Fix error loading javascript in edit tags formfix-tags-10-5Clement Ho2018-03-021-1/+1
| |/
* | Update VERSION to 10.5.3v10.5.3Robert Speicher2018-03-011-1/+1
* | Update CHANGELOG.md for 10.5.3Robert Speicher2018-03-012-5/+7
* | Merge branch '10-5-stable-patch-3' into '10-5-stable'Robert Speicher2018-03-014-1/+19
|\ \ | |/ |/|
| * Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5'Marin Jankovski2018-02-271-1/+1
| * Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-02-273-0/+18
|/
* Update VERSION to 10.5.2v10.5.2Ian Baum2018-02-251-1/+1
* Update CHANGELOG.md for 10.5.2Ian Baum2018-02-2513-60/+21
* Merge branch '10-5-stable-patch-2' into '10-5-stable'Stan Hu2018-02-2386-368/+648
|\
| * Convert Gitaly commit parent IDs to array as early as possibleSean McGivern2018-02-231-1/+1
| * Merge branch 'zj-unit-test-gitaly-arrays' into 'master'Sean McGivern2018-02-232-0/+5
| * Revert "Merge branch 'zj-unit-test-gitaly-arrays' into 'master'"Ian Baum2018-02-232-5/+0
| * Merge branch 'fix-diff-flash' into 'master'Clement Ho2018-02-231-1/+3
| * Merge branch '41619-turn-on-legacy-authorization-for-new-clusters-on-gke' int...Kamil Trzciński2018-02-234-3/+15
| * Merge branch 'git-access-existence-check' into 'master'Robert Speicher2018-02-235-7/+29
| * Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-236-1/+40
| * Merge branch '43373-fix-cache-index-appending' into 'master'Kamil Trzciński2018-02-233-2/+7