diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 12:10:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 12:10:39 +0300 |
| commit | 1bab0ba591263cd739af2d2c7c3f1b03678a59b6 (patch) | |
| tree | 39f499cf5c77338a6c1b94a2cad17153bcb7cada /CHANGELOG.md | |
| parent | 2d03845a7606dc48107ac33e7a66a00956e76955 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 65058d746c5..c2ffec09cb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -636,19 +636,12 @@ entry. ## 12.1.12 -<<<<<<< HEAD -### Security (11 changes) -======= ### Security (12 changes) ->>>>>>> master - Add a policy check for system notes that may not be visible due to cross references to private items. - Display only participants that user has permission to see on milestone page. - Do not disclose project milestones on group milestones page when project milestones access is disabled in project settings. -<<<<<<< HEAD -======= - Check permissions before showing head pipeline blocking merge requests. ->>>>>>> master - Fix new project path being disclosed through unsubscribe link of issue/merge requests. - Prevent bypassing email verification using Salesforce. - Do not show resource label events referencing not accessible labels. |