kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make fixes based on @vsizov's comments on MR !3749

This commit is contained in:
Timothy Andrew 2016-04-22 14:03:11 +05:30
parent 4076bce5d5
commit fc4bce755d
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/profiles/personal_access_tokens_controller.rb
View File

@ -2,10 +2,6 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController
def index
@active_personal_access_tokens = current_user.personal_access_tokens.active.order(:expires_at)
@inactive_personal_access_tokens = current_user.personal_access_tokens.inactive
# Prefer this to `@user.personal_access_tokens.new`, because it
# litters the view's call to `@user.personal_access_tokens` with
# this stub personal access token.
@personal_access_token = PersonalAccessToken.new(user: @user)
end

4
app/models/personal_access_token.rb
View File

@ -1,8 +1,8 @@
class PersonalAccessToken < ActiveRecord::Base
belongs_to :user
scope :active, -> { where(revoked: false).where("expires_at >= :current OR expires_at IS NULL", current: Time.current) }
scope :inactive, -> { where("revoked = true OR expires_at < :current", current: Time.current) }
scope :active, -> { where(revoked: false).where("expires_at >= NOW() OR expires_at IS NULL") }
scope :inactive, -> { where("revoked = true OR expires_at < NOW()") }
def self.generate(params)
personal_access_token = self.new(params)

2
lib/api/helpers/authentication.rb
View File

@ -42,7 +42,7 @@ module API
identifier ||= params[SUDO_PARAM] || env[SUDO_HEADER]
# Regex for integers
if !!(identifier =~ /^[0-9]+$/)
if !!(identifier =~ /\A[0-9]+\z/)
identifier.to_i
else
identifier