diff options
| author | NavaL <ayoyo@thoughtworks.com> | 2016-07-14 15:44:07 +0200 |
|---|---|---|
| committer | NavaL <ayoyo@thoughtworks.com> | 2016-07-14 15:44:07 +0200 |
| commit | e3c2cb91dfef5c39c608b967e702e9de977d1bd2 (patch) | |
| tree | 154dc28dd986bd6e0a48e933c5da46994ffaa0cb /app/models/token.rb | |
| parent | e2f19bcfb6dbce77746c2d61715340525b29a592 (diff) | |
| parent | f09e6ec1337962ab279f021a6a6d0ff30479ebe0 (diff) | |
Merge branch 'develop' of https://github.com/leapcode/leap_web into feature/expose_admin_in_api
Diffstat (limited to 'app/models/token.rb')
| -rw-r--r-- | app/models/token.rb | 4 |
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 |