diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-06-16 11:47:01 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-06-16 11:47:01 +0100 |
| commit | 5eb9cb68f797f8a3e05e4a00c5657c2dd3250c68 (patch) | |
| tree | 8b413094b9e26966e0ef0e47b7c5361e5f426225 | |
| parent | 077e32740c150cb4216f5ecf74229df159dceea0 (diff) | |
| download | gitlab-ce-18474-missing-images-on-confirmation-email.tar.gz | |
Fix images in emails18474-missing-images-on-confirmation-email
| -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 fa0960b2847..c9f745f6ddb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -28,6 +28,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'] |