diff options
| author | Azul <azul@riseup.net> | 2016-03-23 21:48:52 +0100 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-05-02 08:21:52 -0300 |
| commit | 065859b90cc5ef403b8f47bd5394b343e556cc4d (patch) | |
| tree | de62cd7a23b2db2a620911c6d861a7fda1d74a00 /app | |
| parent | abf600089a4bc4b5c7271e17b1fd95a95deb293f (diff) | |
upgrade: remove references to RestClient
CouchRest > 1.2 does not use RestClient anymore. So we should not try to
catch its errors.
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/token.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 079dc18..2af2f29 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,7 +5,7 @@ class ApplicationController < ActionController::Base before_filter :no_frame_header before_filter :language_header rescue_from StandardError, :with => :default_error_handler - rescue_from RestClient::Exception, :with => :default_error_handler + rescue_from CouchRest::Exception, :with => :default_error_handler ActiveSupport.run_load_hooks(:application_controller, self) diff --git a/app/models/token.rb b/app/models/token.rb index b398fcb..8ac32b8 100644 --- a/app/models/token.rb +++ b/app/models/token.rb @@ -59,8 +59,8 @@ class Token < CouchRest::Model::Base # So let's make sure we don't crash if they disappeared def destroy_with_rescue destroy_without_rescue - rescue RestClient::ResourceNotFound # do nothing it's gone already - rescue RestClient::Conflict # do nothing - it's been updated - #7670 + rescue CouchRest::NotFound + rescue CouchRest::Conflict # do nothing - it's been updated - #7670 end alias_method_chain :destroy, :rescue |