diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-12 20:40:17 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-12 20:40:17 +0300 |
| commit | d66148ef393f1748c669c934eec4e928d92ef36a (patch) | |
| tree | 1cf1f2ef2b143dedb300936ac647f263e4196c71 /CHANGELOG | |
| parent | cdb64a81a8ca96961033b8ab06d5191ef5449634 (diff) | |
| parent | 3c7e0f45c2d9c242bf45d153bb73e96ce7525a06 (diff) | |
Merge branch 'fix_email_images' into 'master'
Fix email images
## Dependencies:
This MR Depends on gitlab-org/html-pipeline-gitlab!4 being **merged and published** to rubygems.org
## What does this MR do?
This MR fixes the broken images in emails that occured scince we introduced access control for all attachments in 7.8.
The access control lead to broken images, because the user usually isn't logged into gitlab when opening the email in his mail client.
The solution to fix this, is to replace all images that were uploaded to gitlab as attachemnts with inline images in emails.
I only added one test for images in notes, because all notes share the same view. If it works fine for a note on a commit, then it'll also work the same for notes on a MR or on issues.
@DouweM can you review this please?
Closes #1161
See merge request !373
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0ec9f3177e2..b0adaeb101b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.9.0 (unreleased) + - Fix broken email images (Hannes Rosenögger) - Fix mass SQL statements on initial push (Hannes Rosenögger) - Add tag push notifications and normalize HipChat and Slack messages to be consistent (Stan Hu) - Add comment notification events to HipChat and Slack services (Stan Hu) |