Merge remote-tracking branch 'origin/release/0.19'0.19

1 files changed, 3 insertions, 3 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index d75622b37..4b83d8572 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -99,7 +99,7 @@ class User < ActiveRecord::Base
     end
 
     # Don't display any leading/trailing spaces
-    # XXX we have strip_attributes! now, so perhaps this can be removed (might
+    # TODO: we have strip_attributes! now, so perhaps this can be removed (might
     # be still needed for existing cases)
     def name
         name = read_attribute(:name)
@@ -222,7 +222,7 @@ class User < ActiveRecord::Base
 
     # Can the user make new requests, without having to describe state of (most) existing ones?
     def can_leave_requests_undescribed?
-        # XXX should be flag in database really
+        # TODO: should be flag in database really
         if self.url_name == "heather_brooke" || self.url_name == "heather_brooke_2"
             return true
         end
@@ -425,7 +425,7 @@ class User < ActiveRecord::Base
 
     ## Class methods
     def User.encrypted_password(password, salt)
-        string_to_hash = password + salt # XXX need to add a secret here too?
+        string_to_hash = password + salt # TODO: need to add a secret here too?
         Digest::SHA1.hexdigest(string_to_hash)
     end