summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch '11-6-stable-patch-2' into '11-6-stable'Alex Hanselka2019-01-0245-83/+308
|\ \
| * | Bump Rails 4 dependencies11-6-stable-patch-2Stan Hu2019-01-021-3/+3
| * | Merge branch 'use-px-not-rems' into 'master'Annabel Dunstone Gray2019-01-023-2/+9
| * | Merge branch 'fix-prepare-build-script' into 'master'Marin Jankovski2019-01-021-1/+1
| * | Merge branch 'fj-55781-fix-api-blob-content-disposition' into 'master'Sean McGivern2019-01-025-3/+46
| * | Merge branch 'sh-fix-clone-geo-dropdown' into 'master'Stan Hu2019-01-022-12/+17
| * | Merge branch 'pipeline-labels' into 'master'Stan Hu2019-01-022-2/+5
| * | Merge branch 'sh-fix-http-clone-panel' into 'master'Kushal Pandya2019-01-025-26/+93
| * | Merge branch 'markdown-toolbar-btn-fix' into 'master'Filipa Lacerda2019-01-023-3/+12
| * | Merge branch 'qa-fix-select-activities' into 'master'Mark Lapierre2019-01-022-5/+5
| * | Merge branch '55282-dark-theme-colors' into 'master'Mike Greiling2019-01-021-1/+1
| * | Merge branch '54953-fix-commit_email_hostname-accessor-in-fake_application_se...Stan Hu2019-01-022-0/+9
| * | Merge branch 'fix_reliable_fetcher_version' into 'master'Douglas Barbosa Alexandre2019-01-022-3/+3
| * | Merge branch '55103-hide-group-cluster-features' into 'master'Kushal Pandya2019-01-028-19/+106
| * | Merge branch '55551-nomethoderror-undefined-method-for-nil-nilclass' into 'ma...Kamil Trzciński2019-01-022-2/+3
| * | Merge branch 'osw-revert-suggestions-ff' into 'master'Douwe Maan2019-01-025-20/+4
| * | Merge branch '51668-fix-line-numbers' into 'master'Mike Greiling2019-01-022-1/+11
|/ /
* | Update VERSION to 11.6.1v11.6.1GitLab Release Tools Bot2018-12-281-1/+1
* | Update CHANGELOG.md for 11.6.1GitLab Release Tools Bot2018-12-2817-80/+25
* | Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-2720-22/+248
|\ \
| * \ Merge branch 'security-fix/security-group-user-removal-11-6' into 'security-1...John Jarvis2018-12-2710-11/+120
| |\ \
| | * \ Merge branch 'security-11-6' into 'security-fix/security-group-user-removal-1...James Lopez2018-12-2774-166/+1057
| | |\ \
| | * | | Add subresources removal to member destroy serviceJames Lopez2018-12-1310-13/+116
| * | | | Merge branch 'security-import-symlink-11-6' into 'security-11-6'John Jarvis2018-12-276-4/+62
| |\ \ \ \
| | * | | | Fix persistent symlink in project importJames Lopez2018-12-186-4/+62
| | |/ / /
| * | | | Merge remote-tracking branch 'origin/security-48259-private-snippet-11-6' int...John Jarvis2018-12-279-11/+123
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Block private snippets from being embeddableMark Chao2018-12-209-11/+123
| | |/ /
* | | | Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-2775-177/+1047
|\ \ \ \ | |/ / /
| * | | Merge branch 'security-11-6-secret-ci-variables-exposed' into 'security-11-6'John Jarvis2018-12-2720-44/+372
| |\ \ \
| | * | | Add CHANGELOG entryMatija Čupić2018-12-081-0/+5
| | * | | Backport security fix for 11.6Matija Čupić2018-12-0819-44/+367
| | |/ /
| * | | Merge branch 'security-11-6-user-keeps-access-to-mr-issue-when-removed-from-t...John Jarvis2018-12-276-3/+77
| |\ \ \
| | * | | Adds validation to check if user can read projectTiago Botelho2018-12-266-3/+77
| | |/ /
| * | | Merge branch 'security-11-6-group-cicd-settings-accessible-to-maintainer' int...John Jarvis2018-12-275-15/+56
| |\ \ \
| | * | | Use old-style controller request paramsMatija Čupić2018-12-241-2/+2
| | * | | Add CHANGELOG entryMatija Čupić2018-12-241-0/+5
| | * | | Check for group admin permissionsMatija Čupić2018-12-244-15/+51
| | |/ /
| * | | Merge branch 'security-11-6-guests-jobs-api' into 'security-11-6'John Jarvis2018-12-273-6/+36
| |\ \ \
| | * | | Add CHANGELOG entryMatija Čupić2018-12-221-0/+5
| | * | | Move pipeline auth above pipeline assignmentMatija Čupić2018-12-221-1/+1
| | * | | Authorize read_pipeline before read_buildMatija Čupić2018-12-221-0/+1
| | * | | Authorize read_build when listing pipeline jobsMatija Čupić2018-12-222-3/+15
| | * | | Authorize read_build action when listing jobsMatija Čupić2018-12-222-3/+15
| | |/ /
| * | | Merge branch 'security-11-6-refs-available-to-project-guest' into 'security-1...John Jarvis2018-12-273-4/+26
| |\ \ \
| | * | | Project guests no longer are able to see refs pageTiago Botelho2018-12-103-4/+26
| | |/ /
| * | | Merge branch 'security-11-6-fix-ssrf-lfs-project-import' into 'security-11-6'John Jarvis2018-12-272-13/+88
| |\ \ \
| | * | | [11.6] SSRF in project imports with LFSFrancisco Javier López2018-12-272-13/+88
| |/ / /
| * | | Merge branch 'security-label-xss-11-6' into 'security-11-6'John Jarvis2018-12-273-1/+28
| |\ \ \
| | * | | Escape html entities when no label foundJarka Košanová2018-12-223-1/+28
| | |/ /
| * | | Merge branch 'ensure-that-build-token-is-always-running' into 'security-11-6'John Jarvis2018-12-277-39/+105
| |\ \ \