diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-16 14:50:05 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-16 14:50:05 +0000 |
| commit | db66312cdb40c4d87dbf0d99da0fd2316676f7c7 (patch) | |
| tree | fe6645e72b00c97be2f24c1c6521da5784e39915 | |
| parent | d9812bae49db3b3af7afe702d7b60d75f05d0fad (diff) | |
| parent | 5eb9cb68f797f8a3e05e4a00c5657c2dd3250c68 (diff) | |
| download | gitlab-ce-db66312cdb40c4d87dbf0d99da0fd2316676f7c7.tar.gz | |
Merge branch '18474-missing-images-on-confirmation-email' into 'master'
Fix images in emails
Closes #18474. The confirmation email is actually the only one that uses the `image_tag` helper at the moment, but this will work for all of them:
```shell
$ ag image_tag -G mailer
app/views/layouts/devise_mailer.html.haml
13: = image_tag('mailers/gitlab_header_logo.png', id: 'logo', alt: 'GitLab Wordmark')
24: = image_tag('mailers/gitlab_tanuki_2x.png', alt: 'GitLab Logo')
```
See merge request !4705
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/initializers/default_url_options.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index d035ea2107d..03ca4be80da 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,6 +29,7 @@ v 8.9.0 (unreleased) - Add a metric for the number of new Redis connections created by a transaction - Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark - Redesign navigation for project pages + - Fix images in sign-up confirmation email - Added shortcut 'y' for copying a files content hash URL #14470 - Fix groups API to list only user's accessible projects - Fix horizontal scrollbar for long commit message. diff --git a/config/initializers/default_url_options.rb b/config/initializers/default_url_options.rb index 8fd27b1d88e..de2cdc6ecae 100644 --- a/config/initializers/default_url_options.rb +++ b/config/initializers/default_url_options.rb @@ -9,3 +9,4 @@ unless Gitlab.config.gitlab_on_standard_port? end Rails.application.routes.default_url_options = default_url_options +ActionMailer::Base.asset_host = Settings.gitlab['base_url'] |