summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-03-23 21:48:52 +0100
committerAzul <azul@riseup.net>2016-05-02 08:21:52 -0300
commit065859b90cc5ef403b8f47bd5394b343e556cc4d (patch)
treede62cd7a23b2db2a620911c6d861a7fda1d74a00 /app/models
parentabf600089a4bc4b5c7271e17b1fd95a95deb293f (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/models')
-rw-r--r--app/models/token.rb4
1 files changed, 2 insertions, 2 deletions
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