From 318886287b289a8caccf19102da8584453ef7faa Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 25 Mar 2016 15:09:40 +0100
Subject: Fixing some stuff for Turbolinks, adding gzip on top, fixing a n+1
 query

---
 app/assets/javascripts/mastodon-logo.coffee | 2 +-
 app/assets/javascripts/profiler.coffee      | 2 ++
 app/assets/stylesheets/application.scss     | 4 ++++
 app/models/status.rb                        | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/profiler.coffee

(limited to 'app')

diff --git a/app/assets/javascripts/mastodon-logo.coffee b/app/assets/javascripts/mastodon-logo.coffee
index bcf52f378..0b4e67e79 100644
--- a/app/assets/javascripts/mastodon-logo.coffee
+++ b/app/assets/javascripts/mastodon-logo.coffee
@@ -44,5 +44,5 @@ work = ->
   if runs == stop_at_run
     stop()
 
-$ ->
+$(document).on 'turbolinks:load', ->
   setTimeout(start, 100)
diff --git a/app/assets/javascripts/profiler.coffee b/app/assets/javascripts/profiler.coffee
new file mode 100644
index 000000000..bcdcc1e59
--- /dev/null
+++ b/app/assets/javascripts/profiler.coffee
@@ -0,0 +1,2 @@
+$(document).on 'turbolinks:load', ->
+  window.MiniProfiler.pageTransition() unless typeof window.MiniProfiler == 'undefined'
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e34f0ba32..1f35053a1 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -279,6 +279,10 @@ body {
   }
 }
 
+.turbolinks-progress-bar {
+  background-color: #2b90d9;
+}
+
 .mastodon {
   $head: #282c37;
   $tusk: #d9e1e8;
diff --git a/app/models/status.rb b/app/models/status.rb
index 59c94aaca..439cd3053 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -17,7 +17,7 @@ class Status < ActiveRecord::Base
   validates :text, presence: true, if: Proc.new { |s| s.local? && !s.reblog? }
 
   scope :with_counters, -> { select('statuses.*, (select count(r.id) from statuses as r where r.reblog_of_id = statuses.id) as reblogs_count, (select count(f.id) from favourites as f where f.status_id = statuses.id) as favourites_count') }
-  scope :with_includes, -> { includes(:account, :mentions, reblog: [:account, :mentions], thread: [:account, :mentions]) }
+  scope :with_includes, -> { includes(:account, :mentions, :stream_entry, reblog: [:account, :mentions], thread: [:account, :mentions]) }
 
   def local?
     self.uri.nil?
-- 
cgit