summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 12.1.17v12.1.1712-1-stableGitLab Release Tools Bot2019-12-131-1/+1
* Update CHANGELOG.md for 12.1.17GitLab Release Tools Bot2019-12-133-10/+8
* Merge branch 'ac-fix-12-1' into 12-1-stableAlessio Caiazza2019-12-131-53/+8
|\
| * Simplify static-analysis output generationac-fix-12-1Stan Hu2019-12-131-53/+8
|/
* Merge branch 'backport-21510-12-1' into '12-1-stable'John Skarbek2019-12-131-1/+1
|\
| * Install lsb-release for repo URL constructionKyle Wiebers2019-12-131-1/+1
|/
* Adds message to indicate we are skipping release 12.1.16John T Skarbek2019-12-131-0/+4
* Revert "Update CHANGELOG.md for 12.1.16"John T Skarbek2019-12-133-8/+10
* Revert "Update VERSION to 12.1.16"John T Skarbek2019-12-131-1/+1
* Update VERSION to 12.1.16v12.1.16GitLab Release Tools Bot2019-12-121-1/+1
* Update CHANGELOG.md for 12.1.16GitLab Release Tools Bot2019-12-123-10/+8
* Adds message to indicate we are skipping release 12.1.15John T Skarbek2019-12-121-0/+4
* Revert "Update CHANGELOG.md for 12.1.15"John T Skarbek2019-12-123-8/+10
* Revert "Update VERSION to 12.1.15"John T Skarbek2019-12-121-1/+1
* Update VERSION to 12.1.15v12.1.15GitLab Release Tools Bot2019-12-111-1/+1
* Update CHANGELOG.md for 12.1.15GitLab Release Tools Bot2019-12-113-10/+8
* Merge branch '12-1-stable-backport-reliable-fetcher' into '12-1-stable'John Skarbek2019-12-1012-46/+47
|\
| * Fix specs, backportingValery Sizov2019-12-0910-43/+44
| * Backport reliable fetcherValery Sizov2019-12-092-3/+3
|/
* Merge branch 'security-stored-xss-using-find-file-12-1' into '12-1-stable'GitLab Release Tools Bot2019-10-242-1/+7
|\
| * Sanitize search text to prevent XSSsamantha-dev2019-10-102-1/+7
* | Merge branch 'security-xss-grafana-url-12-1' into '12-1-stable'GitLab Release Tools Bot2019-10-248-15/+189
|\ \ | |/ |/|
| * Handle Stored XSS for Grafana URL in settingsDavid Wilkins2019-10-248-15/+189
|/
* Merge remote-tracking branch 'dev/12-1-stable' into 12-1-stableGitLab Release Tools Bot2019-10-072-1/+5
|\
| * Update VERSION to 12.1.14v12.1.14GitLab Release Tools Bot2019-10-071-1/+1
| * Update CHANGELOG.md for 12.1.14GitLab Release Tools Bot2019-10-071-0/+4
|/
* Merge remote-tracking branch 'dev/12-1-stable' into 12-1-stableGitLab Release Tools Bot2019-10-028-3/+213
|\
| * Update VERSION to 12.1.13v12.1.13GitLab Release Tools Bot2019-10-011-1/+1
| * Update CHANGELOG.md for 12.1.13GitLab Release Tools Bot2019-10-012-5/+7
| * Merge branch 'security-29491-12-1-ce' into '12-1-stable'Marin Jankovski2019-10-017-2/+210
| |\ |/ /
| * EE port: Fix private feature Elasticsearch leakMark Chao2019-10-017-2/+210
|/
* Merge branch 'fix_expired_gpg_key_specs' into 'master'Stan Hu2019-09-302-151/+270
* Update VERSION to 12.1.12v12.1.12GitLab Release Tools Bot2019-09-261-1/+1
* Update CHANGELOG.md for 12.1.12GitLab Release Tools Bot2019-09-2612-58/+17
* Merge branch 'security-gitaly-1-53-4' into '12-1-stable'GitLab Release Tools Bot2019-09-262-1/+6
|\
| * Fix Gitaly SearchBlobs flag RPC injectionPaul Okstad2019-09-242-1/+6
* | Merge branch 'security-sarcila-verify-saml-request-origin-12-1' into '12-1-st...GitLab Release Tools Bot2019-09-2612-40/+303
|\ \
| * | Validate that SAML requests are originated from gitlabSebastian Arcila Valenzuela2019-09-1612-40/+303
* | | Merge branch 'security-xss-mermaid-12-1' into '12-1-stable'GitLab Release Tools Bot2019-09-265-318/+1642
|\ \ \
| * | | Upgrade mermaid to prevent xss attackRajat Jain2019-09-105-318/+1642
* | | | Merge branch 'security-12717-fix-confidential-issue-assignee-visible-to-guest...GitLab Release Tools Bot2019-09-263-1/+47
|\ \ \ \
| * | | | Display only participants that user has permission to seeAlexandru Croitor2019-09-203-1/+47
* | | | | Merge branch 'security-bypass-email-verification-using-salesforce-12-1' into ...GitLab Release Tools Bot2019-09-266-24/+78
|\ \ \ \ \
| * | | | | Bring back unary operatorMałgorzata Ksionek2019-09-111-2/+2
| * | | | | Switch unary operator to more verbose wayMałgorzata Ksionek2019-09-111-2/+2
| * | | | | Bring back unary operatorMałgorzata Ksionek2019-09-111-2/+2
| * | | | | Add checking for email_verified keyMałgorzata Ksionek2019-09-116-24/+78
| | |_|/ / | |/| | |
* | | | | Merge branch 'security-mermaid-block-12-1' into '12-1-stable'GitLab Release Tools Bot2019-09-263-1/+48
|\ \ \ \ \
| * | | | | Only render fixed number of mermaid blocksRajat Jain2019-09-193-1/+48
| |/ / / /
* | | | | Merge branch 'security-12718-project-milestones-disclosed-via-groups-12-1-ce'...GitLab Release Tools Bot2019-09-264-6/+115
|\ \ \ \ \