summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/token.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/token.rb b/app/models/token.rb
index 4afd275..b398fcb 100644
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -59,7 +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
+ rescue RestClient::ResourceNotFound # do nothing it's gone already
+ rescue RestClient::Conflict # do nothing - it's been updated - #7670
end
alias_method_chain :destroy, :rescue