diff options
| author | Javier Castro <javier.alejandro.castro@gmail.com> | 2014-03-04 15:09:33 -0300 |
|---|---|---|
| committer | Javier Castro <javier.alejandro.castro@gmail.com> | 2014-03-04 15:09:33 -0300 |
| commit | b61f80babb10d0583d3199d557b4e8234d981a33 (patch) | |
| tree | 747f124631f6547103bd30d4b48586382b91ae89 /lib/api/api.rb | |
| parent | 556ae5ae8187b89a3785219d5621e7ebc9bb7a8c (diff) | |
| parent | fbbd989770ea48d472a5c4d7d95b970542279099 (diff) | |
| download | gitlab-ce-b61f80babb10d0583d3199d557b4e8234d981a33.tar.gz | |
Merge remote-tracking branch 'upstream/master' into fix-4305
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 283f7642f67..6bec8368b12 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -22,6 +22,8 @@ module API end format :json + content_type :txt, "text/plain" + helpers APIHelpers mount Groups @@ -40,6 +42,7 @@ module API mount ProjectHooks mount Services mount Files + mount Commits mount Namespaces end end |