diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-10-22 21:12:35 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-10-22 21:12:35 -0700 |
| commit | 0e73d7b6af77e2191da2c8fea7232bc8d4a4bbe4 (patch) | |
| tree | 440bd3ea847f534f8e4edb32c2fe4f9f9495f0b8 /lib | |
| parent | a7174efaec77e9408900336b5941d9cca1f82ccf (diff) | |
| parent | 3d613fe1e87a4e9837239b34f5fdf88063ea98f9 (diff) | |
| download | gitlab-ce-0e73d7b6af77e2191da2c8fea7232bc8d4a4bbe4.tar.gz | |
Merge pull request #9762 from huacnlee/fix/api-helpers-bad-autoload-name-for-master
Fix API::APIHelpers -> API::Helpers again for master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/api.rb | 2 | ||||
| -rw-r--r-- | lib/api/helpers.rb | 2 | ||||
| -rw-r--r-- | lib/ci/api/api.rb | 2 |
3 files changed, 3 insertions, 3 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" diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb index 218d8c3adcc..0a4cbf69b63 100644 --- a/lib/ci/api/api.rb +++ b/lib/ci/api/api.rb @@ -26,7 +26,7 @@ module Ci format :json helpers Helpers - helpers ::API::APIHelpers + helpers ::API::Helpers mount Builds mount Commits |