fixes #2417

2015-06-25 13:51:05 -07:00
parent 3cc7dbbedc
commit 1d9596d7f2
64 changed files with 244 additions and 140 deletions
--- a/app/controllers/forum_topics_controller.rb
+++ b/app/controllers/forum_topics_controller.rb
@@ -1,7 +1,7 @@
 class ForumTopicsController < ApplicationController
  respond_to :html, :xml, :json
  before_filter :member_only, :except => [:index, :show]
-  before_filter :janitor_only, :only => [:new_merge, :create_merge]
+  before_filter :moderator_only, :only => [:new_merge, :create_merge]
  before_filter :normalize_search, :only => :index

  def new