diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-06-03 09:31:16 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-06-03 09:31:16 +0530 |
| commit | ae0d8222afe1c2482765c92240d35f41d54a73db (patch) | |
| tree | f3ef7e7fd87f21bae33a595d848c18fd56df8b75 /lib/api/helpers.rb | |
| parent | ffe111c1e22b0cce827c297fea62dfb0bd91326a (diff) | |
| parent | 07b46517cc940b429515374e4e102ff04405e804 (diff) | |
| download | gitlab-ce-ae0d8222afe1c2482765c92240d35f41d54a73db.tar.gz | |
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 68642e2d8a7..a179fe9f2f9 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -2,7 +2,7 @@ module API module Helpers PRIVATE_TOKEN_HEADER = "HTTP_PRIVATE_TOKEN" PRIVATE_TOKEN_PARAM = :private_token - SUDO_HEADER ="HTTP_SUDO" + SUDO_HEADER = "HTTP_SUDO" SUDO_PARAM = :sudo PERSONAL_ACCESS_TOKEN_PARAM = PRIVATE_TOKEN_PARAM PERSONAL_ACCESS_TOKEN_HEADER = PRIVATE_TOKEN_HEADER @@ -41,7 +41,7 @@ module API @current_user end - def sudo_identifier() + def sudo_identifier identifier ||= params[SUDO_PARAM] || env[SUDO_HEADER] # Regex for integers @@ -107,6 +107,17 @@ module API end end + def find_project_label(id) + label = user_project.labels.find_by_id(id) || user_project.labels.find_by_title(id) + label || not_found!('Label') + end + + def find_project_issue(id) + issue = user_project.issues.find(id) + not_found! unless can?(current_user, :read_issue, issue) + issue + end + def paginate(relation) relation.page(params[:page]).per(params[:per_page].to_i).tap do |data| add_pagination_headers(data) |