1
0
Fork 0

Merge branch 'master' of git.atomaka.com:atomaka/creddit

This commit is contained in:
Andrew Tomaka 2016-01-26 11:16:08 -05:00
commit 132e893b14
2 changed files with 2 additions and 2 deletions

View File

@ -10,7 +10,7 @@ class SubcredditsController < ApplicationController
end end
def show def show
@posts = @subcreddit.posts @posts = @subcreddit.posts.includes(:user)
authorize @subcreddit authorize @subcreddit
end end

View File

@ -2,7 +2,7 @@
class UsersController < ApplicationController class UsersController < ApplicationController
def show def show
@user = User.friendly.find(params[:id]) @user = User.friendly.find(params[:id])
@comments = @user.comments.includes(:post) @comments = @user.comments.includes(post: :subcreddit)
end end
def new def new