diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-20 12:52:17 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-20 12:52:17 +0300 |
| commit | d4bc1255817e6cdab95596096067bdc611b71280 (patch) | |
| tree | cb3012be5619542a829268d37df2224e6eaac452 /lib/api | |
| parent | d7ec8451dc5c938e6e30830b83ca17c84091fece (diff) | |
| parent | 2d235221079ef6af90bf482a8f563dd409290751 (diff) | |
| download | gitlab-ce-d4bc1255817e6cdab95596096067bdc611b71280.tar.gz | |
Merge pull request #7856 from cirosantilli/error-to-msg
Fix missing flash on file edit error from web UI.
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/files.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index e63e635a4d3..84e1d311781 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -85,7 +85,7 @@ module API branch_name: branch_name } else - render_api_error!(result[:error], 400) + render_api_error!(result[:message], 400) end end @@ -117,7 +117,7 @@ module API branch_name: branch_name } else - render_api_error!(result[:error], 400) + render_api_error!(result[:message], 400) end end @@ -149,7 +149,7 @@ module API branch_name: branch_name } else - render_api_error!(result[:error], 400) + render_api_error!(result[:message], 400) end end end |