summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | [ci skip]
* 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
| | | | | | [ci skip]
| * Merge branch 'security-29491-12-1-ce' into '12-1-stable'Marin Jankovski2019-10-017-2/+210
| |\ |/ / | | | | | | Fix private feature Elasticsearch leak See merge request gitlab/gitlabhq!3452
| * EE port: Fix private feature Elasticsearch leakMark Chao2019-10-017-2/+210
|/ | | | | | Add spec to test different combinations. Accept string for required_minimum_access_level Allow more flexible project membership query
* Merge branch 'fix_expired_gpg_key_specs' into 'master'Stan Hu2019-09-302-151/+270
| | | | | | | Fix broken specs : Generate new GPG key in place of expired one Closes #32956 See merge request gitlab-org/gitlab!17853
* 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
| | | [ci skip]
* Merge branch 'security-gitaly-1-53-4' into '12-1-stable'GitLab Release Tools Bot2019-09-262-1/+6
|\ | | | | | | | | Fix Gitaly SearchBlobs flag RPC injection [Gitaly v1.53.4] See merge request gitlab/gitlabhq!3435
| * Fix Gitaly SearchBlobs flag RPC injectionPaul Okstad2019-09-242-1/+6
| |
* | Merge branch 'security-sarcila-verify-saml-request-origin-12-1' into ↵GitLab Release Tools Bot2019-09-2612-40/+303
|\ \ | | | | | | | | | | | | | | | | | | '12-1-stable' Check that SAML identity linking validates the origin of the request See merge request gitlab/gitlabhq!3376
| * | Validate that SAML requests are originated from gitlabSebastian Arcila Valenzuela2019-09-1612-40/+303
| | | | | | | | | | | | | | | | | | | | | | | | If the request wasn't initiated by gitlab we shouldn't add the new identity to the user, and instead show that we weren't able to link the identity to the user. This should fix: https://gitlab.com/gitlab-org/gitlab-ce/issues/56509
* | | Merge branch 'security-xss-mermaid-12-1' into '12-1-stable'GitLab Release Tools Bot2019-09-265-318/+1642
|\ \ \ | | | | | | | | | | | | | | | | Gitlab XSS in markdown preview page See merge request gitlab/gitlabhq!3400
| * | | Upgrade mermaid to prevent xss attackRajat Jain2019-09-105-318/+1642
| | | | | | | | | | | | | | | | | | | | Update mermaid to avoid xss surface area. The newer release restricts script tags to be embedded in mermaid blocks.
* | | | Merge branch ↵GitLab Release Tools Bot2019-09-263-1/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-12717-fix-confidential-issue-assignee-visible-to-guests-12-1' into '12-1-stable' Display only participants that user has permission to see See merge request gitlab/gitlabhq!3403
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '12-1-stable' Prevent Bypassing Email Verification using Salesforce See merge request gitlab/gitlabhq!3407
| * | | | | 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
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop offences and add changelog Add email_verified key for feature specs Add code review remarks Add code review remarks Fix specs
* | | | | 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 blocks See merge request gitlab/gitlabhq!3413
| * | | | | Only render fixed number of mermaid blocksRajat Jain2019-09-193-1/+48
| |/ / / /
* | | | | Merge branch ↵GitLab Release Tools Bot2019-09-264-6/+115
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-12718-project-milestones-disclosed-via-groups-12-1-ce' into '12-1-stable' Hide disabled project milestones in project settings on group level See merge request gitlab/gitlabhq!3416
| * | | | | Hide disabled project milestones in project settings on group levelAlexandru Croitor2019-09-264-6/+115
| | |_|_|/ | |/| | |
* | | | | Merge branch 'security-64938-dont-disclose-path-12-1-ce' into '12-1-stable'GitLab Release Tools Bot2019-09-263-1/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Redirect user to root path after unsubscribing from private resource See merge request gitlab/gitlabhq!3418
| * | | | | Redirect user to root path after unsubscribing from private resourceAlexandru Croitor2019-09-203-1/+40
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user unsubsrcribes from a resource that they no longer have access to they should not be revealed the resource path, but be redirected to app root instead. https://gitlab.com/gitlab-org/gitlab-ce/issues/64938
* | | | | Merge branch ↵GitLab Release Tools Bot2019-09-265-0/+178
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-12630-private-system-note-disclosed-in-graphql-12-1-ce' into '12-1-stable' Add policy check if cross reference system notes are accessible See merge request gitlab/gitlabhq!3428
| * | | | | Add policy check if cross reference system notes are accessibleAlexandru Croitor2019-09-255-0/+178
| | |/ / / | |/| | |
* | | | | Merge branch 'security-fp-stop-jobs-when-blocking-user-12-1' into '12-1-stable'GitLab Release Tools Bot2019-09-265-1/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cancel all running CI jobs when user is blocked See merge request gitlab/gitlabhq!3438
| * | | | | Cancel all running CI jobs when user is blockedFabio Pitino2019-09-245-1/+68
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This prevents a MITM attack where attacker could still access Git repository if any jobs were running long enough.
* | | | | Merge branch 'security-cross-reference-fix-ce-12-1' into '12-1-stable'GitLab Release Tools Bot2019-09-268-34/+284
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Filter not accessible label events See merge request gitlab/gitlabhq!3442
| * | | | Filter not accessible label eventsJan Provaznik2019-09-248-34/+284
| |/ / / | | | | | | | | | | | | | | | | | | | | Label events may use cross-project or cross-group references, if the projects are not accessible by user, we don't show these label events.
* | | | Merge branch 'ss/fix-sast-failure-on-master-ee' into 'master'Kushal Pandya2019-09-241-1/+1
|/ / / | | | | | | | | | | | | Add argument to catch See merge request gitlab-org/gitlab-ee!15911
* | | Update VERSION to 12.1.11v12.1.11GitLab Release Tools Bot2019-09-191-1/+1
| | |
* | | Update CHANGELOG.md for 12.1.11GitLab Release Tools Bot2019-09-191-0/+4
| | | | | | | | | [ci skip]
* | | Update VERSION to 12.1.10v12.1.1012-1-stable-patch-11GitLab Release Tools Bot2019-09-191-1/+1
| | |
* | | Update CHANGELOG.md for 12.1.10GitLab Release Tools Bot2019-09-191-0/+4
| | | | | | | | | [ci skip]
* | | Merge branch '12-1-stable-patch-10' into '12-1-stable'John Jarvis2019-09-192-7/+4
|\ \ \ | |/ / |/| | | | | | | | Prepare 12.1.10 release See merge request gitlab-org/gitlab-foss!32979
| * | Merge branch 'sh-fix-captcha-state-pollution-spec' into 'master'12-1-stable-patch-10Mayra Cabrera2019-09-191-7/+1
| | | | | | | | | | | | | | | | | | | | | Fix order-dependent spec failures with reCAPTCHA Closes #67133 See merge request gitlab-org/gitlab-ce!32771
| * | Merge branch 'sh-fix-no-downtime-upgrades-ce' into '12-1-stable-patch-10'John Jarvis2019-09-191-0/+3
| |\ \ |/ / / | | | | | | | | | [12-1-stable] Re-add ignore_column for import columns See merge request gitlab-org/gitlab-foss!32977
| * | Re-add ignore_column for import columnssh-fix-no-downtime-upgrades-ceStan Hu2019-09-171-0/+3
|/ / | | | | | | | | This `ignore_column` was present for a while but recently removed, but to ensure we don't get error 500s let's keep it for a while.
* | Merge remote-tracking branch 'dev/12-1-stable' into 12-1-stableGitLab Release Tools Bot2019-09-113-2/+9
|\ \ | |/ |/|
| * Update VERSION to 12.1.9v12.1.9GitLab Release Tools Bot2019-09-101-1/+1
| |
| * Update CHANGELOG.md for 12.1.9GitLab Release Tools Bot2019-09-102-5/+7
| | | | | | [ci skip]
| * Merge branch 'security-12-1-bump-pages' into '12-1-stable'GitLab Release Tools Bot2019-09-102-1/+6
| |\ |/ / | | | | | | Set max-age and secure flag for pages auth cookies See merge request gitlab/gitlabhq!3380
| * Upgrade pages to 1.7.2Vladimir Shushlin2019-09-092-1/+6
|/
* Update VERSION to 12.1.8v12.1.8GitLab Release Tools Bot2019-08-281-1/+1
|
View Lorry Controller Status