merge with master.

2 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/my/base_controller.rb b/app/controllers/my/base_controller.rb
index 3a0e1335..ce525473 100644
--- a/app/controllers/my/base_controller.rb
+++ b/app/controllers/my/base_controller.rb
@@ -1,5 +1,5 @@
 module My
   class BaseController < ApplicationController
-    before_filter :authenticate_user!
+    before_filter :authenticate!
   end
 end
diff --git a/app/controllers/my/dashboard_controller.rb b/app/controllers/my/dashboard_controller.rb
index 53d9a378..006a55a7 100644
--- a/app/controllers/my/dashboard_controller.rb
+++ b/app/controllers/my/dashboard_controller.rb
@@ -1,7 +1,7 @@
 module My
   class DashboardController < BaseController
     def index
-      @items = (current_user.creations + current_user.tutorials).sort_by! { |x| x.created_at }.reverse
+      @items = (current_user.creations.includes(:photos) + current_user.tutorials).sort_by! { |x| x.created_at }.reverse
       @activities = current_user.recent_activities
     end
   end