diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-27 15:15:47 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-27 15:15:47 +0100 |
| commit | 07f306d8af41c158ba57633fcb129d1a96169877 (patch) | |
| tree | 318485e91cbcf28decc076715019a6f54e0559b0 /lib/api.rb | |
| parent | 3b3add35fb88578df96fe9b728ddac896ea9c944 (diff) | |
| parent | e4b67d3b1831025cc74a7f73e0700014885dea80 (diff) | |
| download | gitlab-ce-07f306d8af41c158ba57633fcb129d1a96169877.tar.gz | |
Merge branch 'master' into fixes/api
Diffstat (limited to 'lib/api.rb')
| -rw-r--r-- | lib/api.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/api.rb b/lib/api.rb index ffd980ca7e0..3264f6a8fa6 100644 --- a/lib/api.rb +++ b/lib/api.rb @@ -22,7 +22,6 @@ module Gitlab end format :json - error_format :json helpers APIHelpers mount Groups |