diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-28 22:45:17 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-28 22:45:17 -0600 |
| commit | f4b2478af11bd5e2125eb245bda4fda7577817d1 (patch) | |
| tree | 6a09934546f4e2ad8db8d43372ac3192834a42f1 /lib | |
| parent | 00ce2be148a06ddd7e692ce963dfab356e331629 (diff) | |
| parent | e14c20582f9f455ade989307016e6726cb8ff959 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/premailer_webpack_strategy.rb | 2 | ||||
| -rw-r--r-- | lib/mastodon/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mastodon/premailer_webpack_strategy.rb b/lib/mastodon/premailer_webpack_strategy.rb index 3382ef3b4..56ef09c1a 100644 --- a/lib/mastodon/premailer_webpack_strategy.rb +++ b/lib/mastodon/premailer_webpack_strategy.rb @@ -2,7 +2,7 @@ module PremailerWebpackStrategy def load(url) - asset_host = ENV['ASSET_HOST'] || ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN'] + asset_host = ENV['CDN_HOST'] || ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN'] if Webpacker.dev_server.running? asset_host = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}" diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index dba09a070..3a67bfb23 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc2' + '' end def to_a |