summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-xss-safe-params-10-7' into 'security-10-7'Sean McGivern2018-06-2024-25/+42
* Merge branch 'security-fj-bumping-sanitize-gem-10-7' into 'security-10-7'Mayra Cabrera2018-06-208-227/+50
* Merge branch 'security-2682-fix-xss-for-markdown-toc-10-7' into 'security-10-7'Mayra Cabrera2018-06-203-1/+15
* Update VERSION to 10.7.5v10.7.5Filipa Lacerda2018-05-281-1/+1
* Update CHANGELOG.md for 10.7.5Filipa Lacerda2018-05-284-15/+9
* Merge branch 'security-fj-import-export-assignment-10-7' into 'security-10-7'Mayra Cabrera2018-05-2512-18/+93
* Merge branch 'security-dm-delete-deploy-key-10-7' into 'security-10-7'Mayra Cabrera2018-05-253-4/+47
* Merge branch 'security-10-7-users-can-update-their-password-without-entering-...Filipa Lacerda2018-05-253-2/+18
* Update VERSION to 10.7.4v10.7.4Filipa Lacerda2018-05-211-1/+1
* Update CHANGELOG.md for 10.7.4Filipa Lacerda2018-05-212-5/+7
* Merge branch '10-7-stable-patch-4' into '10-7-stable'James Lopez2018-05-215-4/+13
|\
| * Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into ...10-7-stable-patch-4Grzegorz Bizon2018-05-193-1/+10
| * Merge branch '10-7-grpc-1.11' into '10-7-stable-patch-4'Mayra Cabrera2018-05-182-3/+3
| |\ |/ /
| * Use grpc 1.11.010-7-grpc-1.11Jacob Vosmaer2018-05-182-3/+3
|/
* Update VERSION to 10.7.3v10.7.3Mayra Cabrera2018-05-021-1/+1
* Update CHANGELOG.md for 10.7.3Mayra Cabrera2018-05-029-40/+14
* Merge branch '10-7-stable-patch-3' into '10-7-stable'Robert Speicher2018-05-0259-340/+735
|\
| * Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-05-023-2/+27
| * Merge branch 'make-job-lfs-artifacts-read-only' into 'master'Douwe Maan2018-05-028-22/+20
| * Merge branch 'bvl-fix-openid-redirect' into 'master'Douwe Maan2018-05-025-1/+23
| * Merge branch 'dm-commit-trailer-without-gravatar' into 'master'Robert Speicher2018-05-0210-227/+250
| * Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-05-028-8/+158
| * Merge branch 'update-doorkeeper-changelog' into 'master'Stan Hu2018-05-021-0/+5
| * Merge branch 'issue_45463' into 'master'Sean McGivern2018-05-024-4/+50
| * Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan2018-05-0216-72/+176
| * Merge branch '44775-avatar-on-os-fails-with-cdn' into 'master'John Northrup2018-05-024-4/+26
* | Merge branch '10-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 10-7-stableMayra Cabrera2018-04-301-1/+1
|\ \
| * \ Merge branch 'update-pages-for-10-7' into '10-7-stable'Kamil TrzciƄski2018-04-301-1/+1
| |\ \ | | |/ | |/|
| | * Update GitLab Pages to v0.8.1Nick Thomas2018-04-271-1/+1
| |/
* | Update VERSION to 10.7.2v10.7.2Mayra Cabrera2018-04-251-1/+1
* | Update CHANGELOG.md for 10.7.2Mayra Cabrera2018-04-253-10/+8
* | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-255-72/+144
* | Merge branch '10-7-security_issue_42029' into 'security-10-7'Phil Hughes2018-04-244-2/+17
|/
* Update VERSION to 10.7.1v10.7.1Mayra Cabrera2018-04-231-1/+1
* Update CHANGELOG.md for 10.7.1Mayra Cabrera2018-04-2317-82/+28
* Merge branch '10-7-stable-patch-1' into '10-7-stable'Stan Hu2018-04-23130-1052/+4067
|\
| * Merge branch '45433-upgrade-doorkeeper' into 'master'Marin Jankovski2018-04-231-1/+1
| * Merge branch '45625-job-log-shows-no-job-log' into 'master'Grzegorz Bizon2018-04-231-0/+5
| * Merge branch 'docs-pages-update2' into 'master'Robert Speicher2018-04-231-5/+31
| * Add missing web ide imagesJames Ramsay2018-04-233-0/+0
| * Remove a test case that has been incorrectly pickedGrzegorz Bizon2018-04-231-28/+0
| * Merge branch '10-7-stable-patch-1-fix-gitaly-proto-version' into '10-7-stable...Filipa Lacerda2018-04-232-4/+4
| |\
| | * GetSnapshot RPC requires gitaly-proto v0.9610-7-stable-patch-1-fix-gitaly-proto-versionNick Thomas2018-04-202-4/+4
| |/
| * Merge branch 'sh-downgrade-mysql-ci' into 'master'Robert Speicher2018-04-201-1/+1
| * Merge branch '39345-get-raw-archive' into 'master'Douwe Maan2018-04-2012-2/+193
| * Merge branch '45514-resolved-table' into 'master'Filipa Lacerda2018-04-202-2/+11
| * Merge branch 'issue_45435' into 'master'Phil Hughes2018-04-202-0/+9
| * Merge branch '45543_update_container_scanning_documentation' into 'master'Robert Speicher2018-04-201-0/+3
| * Merge branch 'fj-42601-respect-visibility-options' into 'master'Douwe Maan2018-04-203-4/+26
| * Merge branch 'fix-direct-upload-for-old-records' into 'master'Grzegorz Bizon2018-04-207-47/+204