diff options
| -rw-r--r-- | app/assets/javascripts/components/selectors/index.jsx | 2 | ||||
| -rw-r--r-- | config/environments/production.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/selectors/index.jsx b/app/assets/javascripts/components/selectors/index.jsx index 91f900f90..3469722a4 100644 --- a/app/assets/javascripts/components/selectors/index.jsx +++ b/app/assets/javascripts/components/selectors/index.jsx @@ -38,7 +38,7 @@ const assembleStatus = (id, statuses, accounts) => { if (status.get('reblog', null) !== null) { reblog = statuses.get(status.get('reblog'), null); - if (reblog !== null) { + if (Immutable.Map.isMap(reblog)) { reblog = reblog.set('account', accounts.get(reblog.get('account'))); } else { return null; diff --git a/config/environments/production.rb b/config/environments/production.rb index 1a2b660a7..8ac857a19 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -19,7 +19,7 @@ Rails.application.configure do config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? # Compress JavaScripts and CSS. - config.assets.js_compressor = Uglifier.new(mangle: false, output: { comments: :all }) + config.assets.js_compressor = Uglifier.new(mangle: false) # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. |