diff options
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/admin_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/auth_sources_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/issue_statuses_controller.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index eb2288eff..0a0a87eab 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -54,7 +54,7 @@ class AdminController < ApplicationController begin Redmine::DefaultData::Loader::load(params[:lang]) flash[:notice] = l(:notice_default_data_loaded) - rescue Exception => e + rescue => e flash[:error] = l(:error_can_t_load_default_data, ERB::Util.h(e.message)) end end @@ -65,7 +65,7 @@ class AdminController < ApplicationController begin Mailer.deliver_test_email(User.current) flash[:notice] = l(:notice_email_sent, ERB::Util.h(User.current.mail)) - rescue Exception => e + rescue => e flash[:error] = l(:notice_email_error, ERB::Util.h(Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup))) end redirect_to settings_path(:tab => 'notifications') diff --git a/app/controllers/auth_sources_controller.rb b/app/controllers/auth_sources_controller.rb index 8eaa155e4..c746f339b 100644 --- a/app/controllers/auth_sources_controller.rb +++ b/app/controllers/auth_sources_controller.rb @@ -60,7 +60,7 @@ class AuthSourcesController < ApplicationController begin @auth_source.test_connection flash[:notice] = l(:notice_successful_connection) - rescue Exception => e + rescue => e flash[:error] = l(:error_unable_to_connect, e.message) end redirect_to auth_sources_path diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb index 2bc6e43de..2e5f66017 100644 --- a/app/controllers/issue_statuses_controller.rb +++ b/app/controllers/issue_statuses_controller.rb @@ -74,7 +74,7 @@ class IssueStatusesController < ApplicationController def destroy IssueStatus.find(params[:id]).destroy redirect_to issue_statuses_path - rescue Exception => e + rescue => e flash[:error] = l(:error_unable_delete_issue_status, ERB::Util.h(e.message)) redirect_to issue_statuses_path end |