Fix rebase with master.

2017-08-28 14:09:44 +02:00
parent 188d492f7a
commit 54cf210b07
8 changed files with 22 additions and 21 deletions
--- a/app/controllers/communities_controller.rb
+++ b/app/controllers/communities_controller.rb
@@ -1,6 +1,6 @@
 class CommunitiesController < ApplicationController

-  before_action :set_order, :set_community, :load_topics, only: :show
+  before_action :set_order, :set_community, :load_topics, :load_participants, only: :show

  has_orders %w{newest most_commented oldest}, only: :show