diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-22 21:08:19 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-22 21:08:19 +0200 |
| commit | 4742dba4c555dc9acc232c31e1066736943ef9fd (patch) | |
| tree | fcf1ba6e870751e5bfaa7fbc393c5b0e47867ad3 /lib/api/helpers.rb | |
| parent | bf15b56a1ee8596189a5617d26059c5c32eac63e (diff) | |
| parent | 4d56c359d343ba3a1117dfc06034820a415450d3 (diff) | |
| download | gitlab-ce-4742dba4c555dc9acc232c31e1066736943ef9fd.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index b0f8d5a6da9..f8c48e2f3b2 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -7,7 +7,7 @@ module API def current_user private_token = (params[PRIVATE_TOKEN_PARAM] || env[PRIVATE_TOKEN_HEADER]).to_s - @current_user ||= User.find_by_authentication_token(private_token) + @current_user ||= User.find_by(authentication_token: private_token) identifier = sudo_identifier() # If the sudo is the current user do nothing @@ -47,7 +47,7 @@ module API end def find_project(id) - project = Project.find_by_id(id) || Project.find_with_namespace(id) + project = Project.find_by(id: id) || Project.find_with_namespace(id) if project && can?(current_user, :read_project, project) project |