diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 17:15:09 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 17:15:09 -0500 |
| commit | ecee057795ff22c335cb999bb677fbc623e879df (patch) | |
| tree | d99398c3e8574848308641a9b21e5a3305208ae9 /lib/api/helpers.rb | |
| parent | 6d19e13df62376916e024ff44939bf2a8f5b671b (diff) | |
| parent | d7a28f3c12950d56a187148fda9dce39a9f2bf08 (diff) | |
| download | gitlab-ce-ecee057795ff22c335cb999bb677fbc623e879df.tar.gz | |
Merge remote-tracking branch 'origin/master' into with-pipeline-view
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 40c967453fb..cadf9f98fe3 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 def parse_boolean(value) @@ -95,6 +95,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) |