logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: dd02fc0ec4ba19a466228187b932412b7846d28d
parent: f3e5625d2de0d90545a4ee422311592042a4ded4
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 18 Oct 2016 01:22:28 +0200

More debugging

Diffstat:

Mapp/assets/javascripts/components/selectors/index.jsx2+-
Mconfig/environments/production.rb2+-
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 @@ -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 @@ -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.