diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-20 14:25:55 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-20 14:25:55 +0300 |
| commit | 74725da142986a5fe55ae59ee202af3bcd56f79a (patch) | |
| tree | 81ca1712600bc0b8242896ab5e6071ff7134818a /CHANGELOG | |
| parent | 9346a8d9b5917411e31f2d2aa83c3bb005c83fda (diff) | |
| parent | ce12749a8a64a880ff415941d7efc9e45d87aa94 (diff) | |
Merge branch 'maxiperezc/gitlab-ce-issues_17198' into 'master'
Fix "Unsubscribe" link in notification emails that is triggered by anti-virus
## What does this MR do?
* The unsubscribe link in an email body only unsubscribes automatically when logged in, otherwise the user is asked for a confirmation.
* The unsubscribe link in an email header unsubscribes automatically whether logged in or not.
## Are there points in the code the reviewer needs to double check?
This addresses all the comments from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5241, I think!
## Why was this MR needed?
People were getting unsubscribed automatically by AV software.
## Screenshot
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fixes #17198.
See merge request !6223
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index c3903f94188..0e4b620c8e0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -70,6 +70,7 @@ v 8.12.0 (unreleased) - Test migration paths from 8.5 until current release !4874 - Replace animateEmoji timeout with eventListener (ClemMakesApps) - Optimistic locking for Issues and Merge Requests (title and description overriding prevention) + - Require confirmation when not logged in for unsubscribe links !6223 (Maximiliano Perez Coto) - Add `wiki_page_events` to project hook APIs (Ben Boeckel) - Remove Gitorious import - Fix inconsistent background color for filter input field (ClemMakesApps) |