diff --git a/app/controllers/tag_aliases_controller.rb b/app/controllers/tag_aliases_controller.rb index 9e098395a..1dd675ef1 100644 --- a/app/controllers/tag_aliases_controller.rb +++ b/app/controllers/tag_aliases_controller.rb @@ -1,6 +1,5 @@ class TagAliasesController < ApplicationController - before_filter :admin_only, :only => [:approve, :destroy] - before_filter :member_only, :only => [:create] + before_filter :admin_only, :only => [:approve, :destroy, :create] respond_to :html, :xml, :json, :js def new diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index 099d947f4..a434a6865 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -292,5 +292,11 @@ module Danbooru def pixa_password nil end + + # If you wish to proxy emails through Amazon SES + def amazon_ses + # {:smtp_server_name => "smtp server name", :user_name => "amazon user name", :ses_smtp_user_name => "smtp user name", :ses_smtp_password => "smtp password"} + nil + end end end