summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytses@gmail.com>2014-10-21 13:22:07 +0200
committerSytse Sijbrandij <sytses@gmail.com>2014-10-21 13:22:07 +0200
commit2e4a33b28751e074cc240c69b9202564ac8c0eb7 (patch)
treed5f6c6d5ccebd75f0305cbac91d57fdfed100c2f /lib/api/files.rb
parente6631c87860c182ce9c838da6b4ad8d570061dfb (diff)
parentfbe9b00fc9304f3e4a98192be99a7dce17ae08a0 (diff)
downloadgitlab-ce-2e4a33b28751e074cc240c69b9202564ac8c0eb7.tar.gz
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'lib/api/files.rb')
-rw-r--r--lib/api/files.rb6
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