diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-16 17:50:05 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-16 20:28:06 +0300 |
| commit | 40e8204b57f7ee13ce1986d315b5573f555c493e (patch) | |
| tree | 0e3045d976871ea792b4e30c5ca4b5add3d87c37 /config | |
| parent | c804fef77ae6ec0dd94665f2b895fea36dc72c1d (diff) | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/default_url_options.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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'] |