diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-04-25 09:00:20 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-04-28 22:28:36 +0530 |
| commit | b22a47c62e076acddd254e2d659f38261085bf01 (patch) | |
| tree | 18a5ae522e9f1129622f526e69c2133b8c4f0782 /lib/api/api.rb | |
| parent | fc4bce755d19d570c4a00241048517c38aa839b3 (diff) | |
| download | gitlab-ce-b22a47c62e076acddd254e2d659f38261085bf01.tar.gz | |
Combine `API::Helpers::Core` and `API::Helpers::Authentication` back into `API::Helpers`
- Makes the MR easier to read; this can go in a separate MR
- This is a (sort of) revert of 99bea01
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 537678863cb..cc1004f8005 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -1,5 +1,4 @@ Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file} -Dir["#{Rails.root}/lib/api/helpers/*.rb"].each {|file| require file} module API class API < Grape::API @@ -26,8 +25,7 @@ module API format :json content_type :txt, "text/plain" - helpers Helpers::Core - helpers Helpers::Authentication + helpers Helpers mount Groups mount GroupMembers |