diff options
| author | Sabba Petri <sabbap@gmail.com> | 2015-02-24 09:41:10 -0800 |
|---|---|---|
| committer | Sabba Petri <sabbap@gmail.com> | 2015-02-24 09:41:10 -0800 |
| commit | 7f200b7d18cddd141f964bd9da5eeb9b9df3fad5 (patch) | |
| tree | 4b0378c33667559100a59d67c9e816cd4506465d /lib/api/files.rb | |
| parent | b3fd0ca04d498504e93894378be98dc1bda7e259 (diff) | |
| parent | 428df28cda4b31a70d908e612bbad627b32c3426 (diff) | |
| download | gitlab-ce-7f200b7d18cddd141f964bd9da5eeb9b9df3fad5.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into sidebar_state_toggle
Diffstat (limited to 'lib/api/files.rb')
| -rw-r--r-- | lib/api/files.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index e6e71bac367..3176ef0e256 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -117,7 +117,8 @@ module API branch_name: branch_name } else - render_api_error!(result[:message], 400) + http_status = result[:http_status] || 400 + render_api_error!(result[:message], http_status) end end |