mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Fixing some stuff for Turbolinks, adding gzip on top, fixing a n+1 query

Browse Source
This commit is contained in:
Eugen Rochko 2016-03-25 15:09:40 +01:00
parent 36f3da3cde
commit 318886287b
7 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -66,5 +66,5 @@ group :production do
end
group :development, :production do
gem 'rack-mini-profiler'
gem 'rack-mini-profiler', require: false
end

2
app/assets/javascripts/mastodon-logo.coffee
View File

@ -44,5 +44,5 @@ work = ->
if runs == stop_at_run
stop()
$ ->
$(document).on 'turbolinks:load', ->
setTimeout(start, 100)

2
app/assets/javascripts/profiler.coffee Normal file
View File

@ -0,0 +1,2 @@
$(document).on 'turbolinks:load', ->
window.MiniProfiler.pageTransition() unless typeof window.MiniProfiler == 'undefined'

4
app/assets/stylesheets/application.scss
View File

@ -279,6 +279,10 @@ body {
}
}
.turbolinks-progress-bar {
background-color: #2b90d9;
}
.mastodon {
$head: #282c37;
$tusk: #d9e1e8;

2
app/models/status.rb
View File

@ -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?

1
config/application.rb
View File

@ -37,5 +37,6 @@ module Mastodon
end
config.middleware.use Rack::Attack
config.middleware.use Rack::Deflater
end
end

6
config/initializers/rack-mini-profiler.rb Normal file
View File

@ -0,0 +1,6 @@
require 'rack-mini-profiler'
Rack::MiniProfilerRails.initialize!(Rails.application)
Rails.application.middleware.delete(Rack::MiniProfiler)
Rails.application.middleware.insert_after(Rack::Deflater, Rack::MiniProfiler)