Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-06-03 07:40:58 +0300
committerTimothy Andrew <mail@timothyandrew.net>2016-06-03 07:41:36 +0300
commit0dff6fd7148957fa94d2626e3912cd929ba150d3 (patch)
tree83237ff06b62a97f04fc7b05cb6566aae7b1ac41 /app/controllers
parent3adf125a155fd04fbba4f0882c739eae1cc73e15 (diff)
Fix rubocop spec.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c8baea2579b..23a0e16ca43 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -368,7 +368,7 @@ class ApplicationController < ActionController::Base
# From https://github.com/plataformatec/devise/wiki/How-To:-Simple-Token-Authentication-Example
# https://gist.github.com/josevalim/fb706b1e933ef01e4fb6
def get_user_from_private_token
- user_token = params[:private_token].presence || request.headers['PRIVATE-TOKEN'].presence
+ user_token = params[:private_token].presence || request.headers['PRIVATE-TOKEN'].presence
User.find_by_authentication_token(user_token.to_s) if user_token
end