summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'security-33689-post-filter-search-results-ce-12-3' into ↵GitLab Release Tools Bot2019-10-249-9/+44
|\ | | | | | | | | | | | | '12-3-stable' Filter out search results based on permissions to avoid bugs leaking data See merge request gitlab/gitlabhq!3495
| * Add #to_ability_name to Project & MilestoneDylan Griffith2019-10-234-0/+24
| | | | | | | | This will be used later for search filtering.
| * Change Note#to_ability_name to 'note'Dylan Griffith2019-10-235-9/+20
|/ | | | | | This is to be more consistent as there is already a :read_note policy in NotePolicy. To keep other behaviour the same we've introduced a Note#noteable_ability_name that is used anywhere this was expected.
* Merge remote-tracking branch 'dev/12-3-stable' into 12-3-stableGitLab Release Tools Bot2019-10-072-1/+5
|\
| * Update VERSION to 12.3.5v12.3.5GitLab Release Tools Bot2019-10-071-1/+1
| |
| * Update CHANGELOG.md for 12.3.5GitLab Release Tools Bot2019-10-071-0/+4
|/ | | [ci skip]
* Merge branch '33216-quarantine-ECDSA' into 'master'Rémy Coutable2019-10-022-2/+2
| | | | | Quarantine some ECDSA related tests due to bumping openssl See merge request gitlab-org/gitlab!18016
* Update VERSION to 12.3.4v12.3.4GitLab Release Tools Bot2019-10-021-1/+1
|
* Update CHANGELOG.md for 12.3.4GitLab Release Tools Bot2019-10-021-0/+4
| | | [ci skip]
* Merge remote-tracking branch 'dev/12-3-stable' into 12-3-stableGitLab Release Tools Bot2019-10-028-3/+213
|\
| * Update VERSION to 12.3.3v12.3.3GitLab Release Tools Bot2019-10-011-1/+1
| |
| * Update CHANGELOG.md for 12.3.3GitLab Release Tools Bot2019-10-012-5/+7
| | | | | | [ci skip]
| * Merge branch 'security-29491-12-3-ce' into '12-3-stable'Marin Jankovski2019-10-017-2/+210
| |\ |/ / | | | | | | Fix private feature Elasticsearch leak See merge request gitlab/gitlabhq!3450
| * 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.3.2v12.3.2GitLab Release Tools Bot2019-09-261-1/+1
|
* Update CHANGELOG.md for 12.3.2GitLab Release Tools Bot2019-09-2611-53/+16
| | | [ci skip]
* Merge branch 'security-gitaly-1-65-1' into '12-3-stable'GitLab Release Tools Bot2019-09-262-1/+6
|\ | | | | | | | | Fix Gitaly SearchBlobs flag RPC injection [Gitaly v1.65.1] See merge request gitlab/gitlabhq!3433
| * Fix Gitaly SearchBlobs flag RPC injectionPaul Okstad2019-09-232-1/+6
| |
* | Merge branch 'security-bypass-email-verification-using-salesforce' into ↵GitLab Release Tools Bot2019-09-266-26/+80
|\ \ | | | | | | | | | | | | | | | | | | '12-3-stable' Prevent Bypassing Email Verification using Salesforce See merge request gitlab/gitlabhq!3395
| * | Reduce change in locale fileMałgorzata Ksionek2019-09-251-1/+4884
| | |
| * | Add checking for email_verified keyMałgorzata Ksionek2019-09-236-4908/+79
| |/ | | | | | | | | | | | | | | | | | | | | | | 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-sarcila-verify-saml-request-origin-12-3' into ↵GitLab Release Tools Bot2019-09-2612-40/+303
|\ \ | | | | | | | | | | | | | | | | | | '12-3-stable' Check that SAML identity linking validates the origin of the request See merge request gitlab/gitlabhq!3396
| * | Validate that SAML requests are originated from gitlabSebastian Arcila Valenzuela2019-09-2012-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-mermaid-block' into '12-3-stable'GitLab Release Tools Bot2019-09-263-1/+48
|\ \ \ | | | | | | | | | | | | | | | | Only render fixed number of mermaid blocks See merge request gitlab/gitlabhq!3411
| * | | Only render fixed number of mermaid blocksRajat Jain2019-09-133-1/+48
| | | |
* | | | Merge branch ↵GitLab Release Tools Bot2019-09-263-1/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-12717-fix-confidential-issue-assignee-visible-to-guests-12-3' into '12-3-stable' Display only participants that user has permission to see See merge request gitlab/gitlabhq!3421
| * | | | Display only participants that user has permission to seeAlexandru Croitor2019-09-233-1/+47
| | |_|/ | |/| |
* | | | Merge branch 'security-64938-dont-disclose-path-12-3-ce' into '12-3-stable'GitLab Release Tools Bot2019-09-263-1/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Redirect user to root path after unsubscribing from private resource See merge request gitlab/gitlabhq!3423
| * | | | Redirect user to root path after unsubscribing from private resourceAlexandru Croitor2019-09-233-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-264-6/+115
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-12718-project-milestones-disclosed-via-groups-12-3-ce' into '12-3-stable' Hide disabled project milestones in project settings on group level See merge request gitlab/gitlabhq!3424
| * | | | Hide disabled project milestones in project settings on group levelAlexandru Croitor2019-09-234-6/+115
| |/ / /
* | | | Merge branch ↵GitLab Release Tools Bot2019-09-265-0/+178
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-12630-private-system-note-disclosed-in-graphql-12-3-ce' into '12-3-stable' Add policy check if cross reference system notes are accessible See merge request gitlab/gitlabhq!3426
| * | | | Add policy check if cross reference system notes are accessibleAlexandru Croitor2019-09-235-0/+178
| |/ / /
* | | | Merge branch 'security-fp-stop-jobs-when-blocking-user-12-3' into '12-3-stable'GitLab Release Tools Bot2019-09-265-1/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cancel all running CI jobs when user is blocked See merge request gitlab/gitlabhq!3436
| * | | | 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-3' into '12-3-stable'GitLab Release Tools Bot2019-09-269-33/+283
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Filter not accessible label events See merge request gitlab/gitlabhq!3440
| * | | | Filter not accessible label eventsJan Provaznik2019-09-249-33/+283
|/ / / / | | | | | | | | | | | | | | | | | | | | 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.
* | | | Update VERSION to 12.3.1v12.3.1GitLab Release Tools Bot2019-09-241-1/+1
| | | |
* | | | Update CHANGELOG.md for 12.3.1GitLab Release Tools Bot2019-09-245-20/+10
| | | | | | | | | | | | [ci skip]
* | | | Add latest changes from gitlab-org/gitlab@12-3-stable-eeGitLab Bot2019-09-2418-73/+285
|/ / /
* | | Update VERSION to 12.3.0v12.3.012-3-stable-patch-1GitLab Release Tools Bot2019-09-201-1/+1
| | |
* | | Update CHANGELOG.md for 12.3.0GitLab Release Tools Bot2019-09-20246-1230/+269
| |/ |/| | | [ci skip]
* | Update VERSION to 12.3.0-rc42v12.3.0-rc42GitLab Release Tools Bot2019-09-201-1/+1
| |
* | Add latest changes from gitlab-org/gitlab@12-3-stableGitLab Bot2019-09-20395-4726/+1795
| |
* | Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-2027-286/+371
| |
* | Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-2013-106/+174
| |
* | Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-208-16/+27
| |
* | Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-208-19/+70
| |
* | Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-205-8/+62
| |
View Lorry Controller Status