summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-06-30 14:41:19 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-07-19 14:16:54 +0200
commitc0ebfea6baf330ed5ae5bc870407fe47f76119cf (patch)
tree3d6cf15db54a50b7908920c4ac2d60f14628b29d /app/models
parent1cd573ee7f03bcb356478aab5900fae4618b53ec (diff)
downloadgitlab-ce-c0ebfea6baf330ed5ae5bc870407fe47f76119cf.tar.gz
Fix some useless access modifiers in the code
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/token_authenticatable.rb28
1 files changed, 14 insertions, 14 deletions
diff --git a/app/models/concerns/token_authenticatable.rb b/app/models/concerns/token_authenticatable.rb
index 885deaf78d2..27a03b3bada 100644
--- a/app/models/concerns/token_authenticatable.rb
+++ b/app/models/concerns/token_authenticatable.rb
@@ -1,6 +1,20 @@
module TokenAuthenticatable
extend ActiveSupport::Concern
+ private
+
+ def write_new_token(token_field)
+ new_token = generate_token(token_field)
+ write_attribute(token_field, new_token)
+ end
+
+ def generate_token(token_field)
+ loop do
+ token = Devise.friendly_token
+ break token unless self.class.unscoped.find_by(token_field => token)
+ end
+ end
+
class_methods do
def authentication_token_fields
@token_fields || []
@@ -32,18 +46,4 @@ module TokenAuthenticatable
end
end
end
-
- private
-
- def write_new_token(token_field)
- new_token = generate_token(token_field)
- write_attribute(token_field, new_token)
- end
-
- def generate_token(token_field)
- loop do
- token = Devise.friendly_token
- break token unless self.class.unscoped.find_by(token_field => token)
- end
- end
end