diff --git a/Gemfile b/Gemfile index 90767f73c..ca29eaf1d 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem 'rmagick', :require => "RMagick" gem 'daemons' gem 'net-ssh' gem 'net-sftp' -gem 'newrelic_rpm' +# gem 'newrelic_rpm' group :development do gem 'pry' diff --git a/Gemfile.lock b/Gemfile.lock index 615f3d644..93edb0e7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,7 +94,6 @@ GEM net-sftp (2.0.5) net-ssh (>= 2.0.9) net-ssh (2.6.3) - newrelic_rpm (3.5.5.38) nokogiri (1.5.6) ntlm-http (0.1.1) pg (0.12.2) @@ -193,7 +192,6 @@ DEPENDENCIES mocha net-sftp net-ssh - newrelic_rpm nokogiri pg (= 0.12.2) pry diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index e9fd423b9..2b7f56cdf 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -58,7 +58,7 @@ class CommentsController < ApplicationController private def index_for_post @post = Post.find(params[:post_id]) - @comments = @post.comments.includes(:creator) + @comments = @post.comments @comments = @comments.visible(CurrentUser.user) unless params[:include_below_threshold] render :action => "index_for_post" end diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index 6aae9f88b..75cf09b3b 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -53,7 +53,7 @@
- <%= render "comments/partials/index/list", :comments => @post.comments.includes(:creator), :post => @post, :show_header => false %> + <%= render "comments/partials/index/list", :comments => @post.comments, :post => @post, :show_header => false %>