diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-27 17:46:58 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-27 17:46:58 +0100 |
| commit | 5b8e0f17a8e77bf4cbdb4ed61d116d29d9f3c9c7 (patch) | |
| tree | 606bd29af2da226a85c1aa1953c2c2a21d476d84 /lib/api | |
| parent | 35d433a3200b64f80a21b940f68d97a4392611f2 (diff) | |
| parent | 940d68cc4c349b574166b010666a36cf25f485b7 (diff) | |
| download | gitlab-ce-ci-details.tar.gz | |
Merge branch 'master' into ci-detailsci-details
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/api.rb | 2 | ||||
| -rw-r--r-- | lib/api/helpers.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index afc0402f9e1..40671e2517c 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -25,7 +25,7 @@ module API format :json content_type :txt, "text/plain" - helpers APIHelpers + helpers Helpers mount Groups mount GroupMembers diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 549b1f9e9a7..652bdf9b278 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -1,5 +1,5 @@ module API - module APIHelpers + module Helpers PRIVATE_TOKEN_HEADER = "HTTP_PRIVATE_TOKEN" PRIVATE_TOKEN_PARAM = :private_token SUDO_HEADER ="HTTP_SUDO" |