]> cat aescling's git repositories - mastodon.git/commitdiff
More debugging
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 17 Oct 2016 23:22:28 +0000 (01:22 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 17 Oct 2016 23:22:28 +0000 (01:22 +0200)
app/assets/javascripts/components/selectors/index.jsx
config/environments/production.rb

index 91f900f9048df1885c64cba7fdc82f62aef33c37..3469722a44b22311037acd136cd289a86eac2658 100644 (file)
@@ -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;
index 1a2b660a7720bb9a6cf5cc8a60bc1cc74c575f9e..8ac857a194127ee25e01e6ee107f64712fb47edb 100644 (file)
@@ -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.