diff --git a/Gemfile b/Gemfile index e6974d7a1..3cec1c5a7 100644 --- a/Gemfile +++ b/Gemfile @@ -192,7 +192,7 @@ gem 'lru_redux' # 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 # 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 # redis-rack-cache is missing a sane expiry policy, it hogs redis diff --git a/Gemfile.lock b/Gemfile.lock index 784c71faa..fb384003d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -305,7 +305,7 @@ GEM rack (>= 0.4) rack-cors (0.2.7) rack - rack-mini-profiler (0.1.27) + rack-mini-profiler (0.1.28) rack (>= 1.1.3) rack-openid (1.3.1) rack (>= 1.1.0) @@ -519,7 +519,7 @@ DEPENDENCIES qunit-rails rack-cache rack-cors - rack-mini-profiler (= 0.1.27) + rack-mini-profiler (= 0.1.28) rails (= 3.2.12) rails_multisite! rake diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb index 753e2b8ca..b574ba4ec 100644 --- a/lib/admin_user_index_query.rb +++ b/lib/admin_user_index_query.rb @@ -1,3 +1,5 @@ +require_dependency 'trust_level' + class AdminUserIndexQuery def initialize(params = {}, klass = User, trust_levels = TrustLevel.levels) @params = params @@ -53,4 +55,4 @@ class AdminUserIndexQuery def find_users find_users_query.take(100) end -end \ No newline at end of file +end diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index b80d13f74..b2b8e5d03 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -87,7 +87,7 @@ module Email end def discourse_email_parser - lines = @body.lines + lines = @body.lines.to_a range_end = 0 email_year = diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb index 01985156f..5f85c97b0 100644 --- a/spec/components/admin_user_index_query_spec.rb +++ b/spec/components/admin_user_index_query_spec.rb @@ -111,4 +111,4 @@ describe AdminUserIndexQuery do end end -end \ No newline at end of file +end