Merge remote-tracking branch 'openstreetmap/pull/1004'

[rails.git] / app / models / oauth_nonce.rb

diff --git a/app/models/oauth_nonce.rb b/app/models/oauth_nonce.rb
index 84211e31d355e6ef96b9187a24eb246e0acd3856..4d615dd5defcba96a238bf6cfbab81d55ff6b875 100644 (file)
--- a/app/models/oauth_nonce.rb
+++ b/app/models/oauth_nonce.rb
@@ -1,8 +1,8 @@
 # Simple store of nonces. The OAuth Spec requires that any given pair of nonce and timestamps are unique.
 # Thus you can use the same nonce with a different timestamp and viceversa.
 class OauthNonce < ActiveRecord::Base
-  validates_presence_of :nonce, :timestamp
-  validates_uniqueness_of :nonce, :scope => :timestamp
+  validates :timestamp, :presence => true
+  validates :nonce, :presence => true, :uniqueness => { :scope => :timestamp }
 
   # Remembers a nonce and it's associated timestamp. It returns false if it has already been used
   def self.remember(nonce, timestamp)