mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
upgrade rack mini profiler
fixes for ruby 1.9.3
This commit is contained in:
parent
9749001b54
commit
df3a4c05cd
2
Gemfile
2
Gemfile
@ -192,7 +192,7 @@ gem 'lru_redux'
|
|||||||
# IMPORTANT: mini profiler monkey patches, so it better be required last
|
# IMPORTANT: mini profiler monkey patches, so it better be required last
|
||||||
# If you want to amend mini profiler to do the monkey patches in the railstie
|
# If you want to amend mini profiler to do the monkey patches in the railstie
|
||||||
# we are open to it. by deferring require to the initializer we can configure disourse installs without it
|
# we are open to it. by deferring require to the initializer we can configure disourse installs without it
|
||||||
gem 'rack-mini-profiler', '0.1.27', require: false # require: false #, git: 'git://github.com/SamSaffron/MiniProfiler'
|
gem 'rack-mini-profiler', '0.1.28', require: false # require: false #, git: 'git://github.com/SamSaffron/MiniProfiler'
|
||||||
|
|
||||||
# used for caching, optional
|
# used for caching, optional
|
||||||
# redis-rack-cache is missing a sane expiry policy, it hogs redis
|
# redis-rack-cache is missing a sane expiry policy, it hogs redis
|
||||||
|
@ -305,7 +305,7 @@ GEM
|
|||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-cors (0.2.7)
|
rack-cors (0.2.7)
|
||||||
rack
|
rack
|
||||||
rack-mini-profiler (0.1.27)
|
rack-mini-profiler (0.1.28)
|
||||||
rack (>= 1.1.3)
|
rack (>= 1.1.3)
|
||||||
rack-openid (1.3.1)
|
rack-openid (1.3.1)
|
||||||
rack (>= 1.1.0)
|
rack (>= 1.1.0)
|
||||||
@ -519,7 +519,7 @@ DEPENDENCIES
|
|||||||
qunit-rails
|
qunit-rails
|
||||||
rack-cache
|
rack-cache
|
||||||
rack-cors
|
rack-cors
|
||||||
rack-mini-profiler (= 0.1.27)
|
rack-mini-profiler (= 0.1.28)
|
||||||
rails (= 3.2.12)
|
rails (= 3.2.12)
|
||||||
rails_multisite!
|
rails_multisite!
|
||||||
rake
|
rake
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
require_dependency 'trust_level'
|
||||||
|
|
||||||
class AdminUserIndexQuery
|
class AdminUserIndexQuery
|
||||||
def initialize(params = {}, klass = User, trust_levels = TrustLevel.levels)
|
def initialize(params = {}, klass = User, trust_levels = TrustLevel.levels)
|
||||||
@params = params
|
@params = params
|
||||||
@ -53,4 +55,4 @@ class AdminUserIndexQuery
|
|||||||
def find_users
|
def find_users
|
||||||
find_users_query.take(100)
|
find_users_query.take(100)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -87,7 +87,7 @@ module Email
|
|||||||
end
|
end
|
||||||
|
|
||||||
def discourse_email_parser
|
def discourse_email_parser
|
||||||
lines = @body.lines
|
lines = @body.lines.to_a
|
||||||
range_end = 0
|
range_end = 0
|
||||||
|
|
||||||
email_year =
|
email_year =
|
||||||
|
@ -111,4 +111,4 @@ describe AdminUserIndexQuery do
|
|||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user