jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2897 from evazion/fix-rescue_from

Browse Source 
Remove redundant rescue_from calls.
This commit is contained in:
Albert Yi
2017-02-27 16:48:44 -08:00
committed by GitHub
parent 1fa0aabbe0 40092f21ba
commit 3780645cb2
12 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/admin/users_controller.rb
View File

@@ -1,7 +1,6 @@
module Admin module Admin
class UsersController < ApplicationController class UsersController < ApplicationController
before_filter :moderator_only before_filter :moderator_only
rescue_from User::PrivilegeError, :with => :access_denied
def edit def edit
@user = User.find(params[:id]) @user = User.find(params[:id])

1
app/controllers/comments_controller.rb
View File

@@ -1,7 +1,6 @@
class CommentsController < ApplicationController class CommentsController < ApplicationController
respond_to :html, :xml, :json respond_to :html, :xml, :json
before_filter :member_only, :except => [:index, :search, :show] before_filter :member_only, :except => [:index, :search, :show]
rescue_from ActiveRecord::StatementInvalid, :with => :rescue_exception
skip_before_filter :api_check skip_before_filter :api_check
def index def index

1
app/controllers/dmails_controller.rb
View File

@@ -1,7 +1,6 @@
class DmailsController < ApplicationController class DmailsController < ApplicationController
respond_to :html, :xml, :json respond_to :html, :xml, :json
before_filter :member_only before_filter :member_only
rescue_from User::PrivilegeError, :with => :access_denied
def new def new
if params[:respond_to_id] if params[:respond_to_id]

1
app/controllers/legacy_controller.rb
View File

@@ -1,6 +1,5 @@
class LegacyController < ApplicationController class LegacyController < ApplicationController
before_filter :member_only, :only => [:create_post] before_filter :member_only, :only => [:create_post]
rescue_from PostSets::SearchError, :with => :rescue_exception
def posts def posts
@post_set = PostSets::Post.new(tag_query, params[:page], params[:limit], format: "json") @post_set = PostSets::Post.new(tag_query, params[:page], params[:limit], format: "json")

2
app/controllers/maintenance/user/deletions_controller.rb
View File

@@ -1,8 +1,6 @@
module Maintenance module Maintenance
module User module User
class DeletionsController < ApplicationController class DeletionsController < ApplicationController
rescue_from UserDeletion::ValidationError, :with => :rescue_exception
def show def show
end end

1
app/controllers/moderator/post/posts_controller.rb
View File

@@ -3,7 +3,6 @@ module Moderator
class PostsController < ApplicationController class PostsController < ApplicationController
before_filter :approver_only, :only => [:delete, :undelete, :move_favorites, :ban, :unban, :confirm_delete, :confirm_move_favorites, :confirm_ban] before_filter :approver_only, :only => [:delete, :undelete, :move_favorites, :ban, :unban, :confirm_delete, :confirm_move_favorites, :confirm_ban]
before_filter :admin_only, :only => [:expunge] before_filter :admin_only, :only => [:expunge]
rescue_from ::PostFlag::Error, ::Post::ApprovalError, :with => :rescue_exception
skip_before_filter :api_check skip_before_filter :api_check
def confirm_delete def confirm_delete

1
app/controllers/post_versions_controller.rb
View File

@@ -1,6 +1,5 @@
class PostVersionsController < ApplicationController class PostVersionsController < ApplicationController
respond_to :html, :xml, :json respond_to :html, :xml, :json
rescue_from ActiveRecord::StatementInvalid, :with => :rescue_exception
def index def index
@post_versions = PostArchive.search(params[:search]).order("updated_at desc, id desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) @post_versions = PostArchive.search(params[:search]).order("updated_at desc, id desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])

4
app/controllers/posts_controller.rb
View File

@@ -3,10 +3,6 @@ class PostsController < ApplicationController
before_filter :builder_only, :only => [:copy_notes] before_filter :builder_only, :only => [:copy_notes]
before_filter :enable_cors, :only => [:index, :show] before_filter :enable_cors, :only => [:index, :show]
respond_to :html, :xml, :json respond_to :html, :xml, :json
rescue_from PostSets::SearchError, :with => :rescue_exception
rescue_from Post::SearchError, :with => :rescue_exception
rescue_from ActiveRecord::StatementInvalid, :with => :rescue_exception
rescue_from ActiveRecord::RecordNotFound, :with => :rescue_exception
def index def index
if params[:md5].present? if params[:md5].present?

1
app/controllers/uploads_controller.rb
View File

@@ -1,7 +1,6 @@
class UploadsController < ApplicationController class UploadsController < ApplicationController
before_filter :member_only before_filter :member_only
respond_to :html, :xml, :json, :js respond_to :html, :xml, :json, :js
rescue_from Upload::Error, :with => :rescue_exception
def new def new
@upload = Upload.new @upload = Upload.new

1
app/controllers/user_name_change_requests_controller.rb
View File

@@ -2,7 +2,6 @@ class UserNameChangeRequestsController < ApplicationController
before_filter :member_only, :only => [:index, :show] before_filter :member_only, :only => [:index, :show]
before_filter :gold_only, :only => [:new, :create] before_filter :gold_only, :only => [:new, :create]
before_filter :admin_only, :only => [:approve, :reject] before_filter :admin_only, :only => [:approve, :reject]
rescue_from User::PrivilegeError, :with => :access_denied
respond_to :html, :json, :xml respond_to :html, :json, :xml
def new def new

1
app/controllers/users_controller.rb
View File

@@ -1,7 +1,6 @@
class UsersController < ApplicationController class UsersController < ApplicationController
respond_to :html, :xml, :json respond_to :html, :xml, :json
before_filter :member_only, :only => [:edit, :update, :upgrade] before_filter :member_only, :only => [:edit, :update, :upgrade]
rescue_from User::PrivilegeError, :with => :access_denied
skip_before_filter :api_check skip_before_filter :api_check
def new def new

2
app/controllers/wiki_pages_controller.rb
View File

@@ -3,8 +3,6 @@ class WikiPagesController < ApplicationController
before_filter :member_only, :except => [:index, :show, :show_or_new] before_filter :member_only, :except => [:index, :show, :show_or_new]
before_filter :builder_only, :only => [:destroy] before_filter :builder_only, :only => [:destroy]
before_filter :normalize_search_params, :only => [:index] before_filter :normalize_search_params, :only => [:index]
rescue_from ActiveRecord::StatementInvalid, :with => :rescue_exception
rescue_from ActiveRecord::RecordNotFound, :with => :rescue_exception
def new def new
@wiki_page = WikiPage.new(params[:wiki_page]) @wiki_page = WikiPage.new(params[:wiki_page])