diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-11 13:22:00 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-11 13:22:00 +0100 |
| commit | 9f548dffc33158adb02ef1ec9a6e98b3d090f22b (patch) | |
| tree | 39f5619db8f33c70dcdf52dbc8d07b3cb8486e59 /lib/api/api.rb | |
| parent | 8db063b579322238af43f6d04b5968d9c6ea935d (diff) | |
| parent | dfa09789061bbd3891c17ebbcc23f7bd6b95336c (diff) | |
| download | gitlab-ce-9f548dffc33158adb02ef1ec9a6e98b3d090f22b.tar.gz | |
Merge branch 'master' into rake-tasks-git
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 2 |
1 files changed, 1 insertions, 1 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 |