summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 11.4.8v11.4.8GitLab Release Tools Bot2018-11-271-1/+1
* Update CHANGELOG.md for 11.4.8GitLab Release Tools Bot2018-11-2725-122/+30
* Merge branch 'security-11-4-fix-webhook-ssrf-ipv6' into 'security-11-4'Steve Azzopardi2018-11-263-13/+114
|\
| * Fix SSRF in project integrationsFrancisco Javier López2018-11-263-13/+114
* | Merge branch 'security-fix-uri-xss-applications-11-4' into 'security-11-4'Steve Azzopardi2018-11-267-2/+121
|\ \
| * | Resolve reflected XSS in Ouath authorize windowJames Lopez2018-11-267-2/+121
* | | Merge branch 'security-11-4-fj-crlf-injection' into 'security-11-4'Steve Azzopardi2018-11-265-39/+113
|\ \ \ | |_|/ |/| |
| * | [11.4] Fix CRLF issue in UrlValidatorFrancisco Javier López2018-11-265-39/+113
|/ /
* | Merge branch '11-4-stable' into security-11-4Steve Azzopardi2018-11-261-1/+2
|\ \
| * \ Merge branch 'charts-gitlab-937-pass-compile-assets' into '11-4-stable'Rémy Coutable2018-11-211-1/+2
| |\ \
| | * | CI: Add COMPILE_ASSETS to cng build triggercharts-gitlab-937-pass-compile-assetsJason Plum2018-11-201-1/+2
| |/ /
* | | Merge branch 'security-email-change-notification-11-4' into 'security-11-4'Steve Azzopardi2018-11-265-0/+32
|\ \ \ | |_|/ |/| |
| * | Provide email notification on email updatesJames Lopez2018-11-125-0/+32
* | | Merge branch 'security-guest-comments-11-4' into 'security-11-4'Steve Azzopardi2018-11-2613-34/+187
|\ \ \
| * | | [11.4] Fixed ability to comment on and edit/delete comments on locked or conf...Chantal Rollison2018-11-2613-34/+187
|/ / /
* | | Merge branch 'security-11-4-pages-toctou-race' into 'security-11-4'Steve Azzopardi2018-11-262-1/+7
|\ \ \
| * | | Upgrade GitLab Pages to v1.1.1Alessio Caiazza2018-11-212-1/+7
* | | | Merge branch 'security-fix-pat-web-access-11-4' into 'security-11-4'Steve Azzopardi2018-11-2628-277/+538
|\ \ \ \
| * | | | Update code to use API scope on PAT authJames Lopez2018-11-2328-277/+538
| |/ / /
* | | | Merge branch 'security-11-4-xss-in-markdown-following-unrecognized-html-eleme...Steve Azzopardi2018-11-235-2/+25
|\ \ \ \
| * | | | Sanitize output of SpacedLinkFilterBrett Walker2018-11-165-2/+25
* | | | | Merge branch 'security-mermaid-xss-11-4' into 'security-11-4'Steve Azzopardi2018-11-234-1/+21
|\ \ \ \ \
| * | | | | Configure mermaid to not render HTML content in diagramsWinnie Hellmann2018-11-142-0/+8
| * | | | | Add failing test for XSS in mermaid diagramsWinnie Hellmann2018-11-142-1/+13
| |/ / / /
* | | | | Merge branch 'security-bvl-exposure-in-commits-list-11-4' into 'security-11-4'Steve Azzopardi2018-11-233-55/+67
|\ \ \ \ \
| * | | | | Don't use fragment cache on commit pageBob Van Landuyt2018-11-193-55/+67
| | |/ / / | |/| | |
* | | | | Merge branch 'security-issue_51301-11-4' into 'security-11-4'Steve Azzopardi2018-11-236-12/+96
|\ \ \ \ \
| * | | | | Fix milestone promotion authorizationFelipe Artur2018-11-146-12/+96
| | |_|/ / | |/| | |
* | | | | Merge branch 'security-2736-prometheus-ssrf-11-4' into 'security-11-4'Steve Azzopardi2018-11-234-3/+25
|\ \ \ \ \
| * | | | | No redirects in prometheus servicerpereira22018-11-144-3/+25
| | |_|/ / | |/| | |
* | | | | Merge branch 'security-11-4-stored-xss-for-environments' into 'security-11-4'Steve Azzopardi2018-11-237-6/+67
|\ \ \ \ \
| * | | | | Validate URI scheme also for internal URIAlessio Caiazza2018-11-157-6/+67
| |/ / / /
* | | | | Merge branch '11-4-stable' into security-11-4Steve Azzopardi2018-11-232-1/+12
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Update VERSION to 11.4.7v11.4.7GitLab Release Tools Bot2018-11-201-1/+1
| * | | | Update CHANGELOG.md for 11.4.7GitLab Release Tools Bot2018-11-201-0/+4
| * | | | Update VERSION to 11.4.6v11.4.611-4-stable-patch-7GitLab Release Tools Bot2018-11-181-1/+1
| * | | | Update CHANGELOG.md for 11.4.6GitLab Release Tools Bot2018-11-182-5/+7
| * | | | Merge branch 'sh-fix-issue-54189-11-4' into 'security-11-4'Steve Azzopardi2018-11-184-1/+37
| * | | | Merge branch 'security-11-4-2717-xss-username-autocomplete' into 'security-11-4'Steve Azzopardi2018-11-183-11/+40
* | | | | Merge branch 'security-private-group-11-4' into 'security-11-4'Steve Azzopardi2018-11-233-0/+26
|\ \ \ \ \
| * | | | | Fixed read name of private groupsChantal Rollison2018-11-073-0/+26
| | |_|/ / | |/| | |
* | | | | Merge branch 'security-182-update-workhorse-11-4' into 'security-11-4'Steve Azzopardi2018-11-233-1/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Redact sensitive information on workhorse logMark Chao2018-11-053-1/+8
| |/ / /
* | | | Merge branch 'sh-fix-issue-54189-11-4' into 'security-11-4'Steve Azzopardi2018-11-184-1/+37
|\ \ \ \
| * | | | Prevent templated services from being importedStan Hu2018-11-184-1/+37
* | | | | Merge branch 'security-11-4-2717-xss-username-autocomplete' into 'security-11-4'Steve Azzopardi2018-11-183-11/+40
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add changelog entryKushal Pandya2018-11-121-0/+5
| * | | | Fix user name autocomplete XSS when name contains HTMLKushal Pandya2018-11-122-11/+35
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'dev.gitlab.org/11-4-stable' into security-11-4Winnie Hellmann2018-11-14253-1136/+758
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Update VERSION to 11.4.5v11.4.5GitLab Release Tools Bot2018-11-041-1/+1