summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 08:44:24 +0000
committerDouwe Maan <douwe@gitlab.com>2015-04-14 08:44:24 +0000
commit36537c65e3b032ac80b2d7f345111a0af0ab6894 (patch)
tree7fbac1ffb0dfd00071d32382b83b9bc90c9d3cc0 /spec/models
parent41cdc5eb8a5add35196b185280dd1a5237c6c418 (diff)
parent8e9fbd847d8ad44edd7346428276b055c765e252 (diff)
downloadgitlab-ce-36537c65e3b032ac80b2d7f345111a0af0ab6894.tar.gz
Merge branch 'revert_fix_email_images' into 'master'
Revert "Merge branch 'fix_email_images' into 'master'" This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634. This change needed to be reverted, because not enough email clients support inline images. /cc @DouweM As discussed before. I'll try to create a MR to allow access to all images this week. I'm a bit busy at the moment so no guarantees. ;) See merge request !513
Diffstat (limited to 'spec/models')
0 files changed, 0 insertions, 0 deletions