summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-01-25 03:50:38 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-02-05 18:58:18 +0100
commitbf2a040cf9fb8e0eb3576732f3cda6fe6326e65d (patch)
tree8884cfc202b6550db3c6b9292fa93a77ebdbadab /app
parent1292c158ce909e9054f842a90095810c0d464e18 (diff)
downloadgitlab-ce-bf2a040cf9fb8e0eb3576732f3cda6fe6326e65d.tar.gz
Pass validation errors in JSON endpoint
Diffstat (limited to 'app')
-rw-r--r--app/controllers/groups/variables_controller.rb2
-rw-r--r--app/controllers/projects/variables_controller.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/groups/variables_controller.rb b/app/controllers/groups/variables_controller.rb
index 5fbf532b98e..3a832a7c005 100644
--- a/app/controllers/groups/variables_controller.rb
+++ b/app/controllers/groups/variables_controller.rb
@@ -7,7 +7,7 @@ module Groups
format.json do
return head :ok if @group.update(variables_params)
- head :bad_request
+ render status: :bad_request, json: @group.errors.to_hash
end
end
end
diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb
index 8bee1b97d14..9c0dad393c3 100644
--- a/app/controllers/projects/variables_controller.rb
+++ b/app/controllers/projects/variables_controller.rb
@@ -6,7 +6,7 @@ class Projects::VariablesController < Projects::ApplicationController
format.json do
return head :ok if @project.update(variables_params)
- head :bad_request
+ render status: :bad_request, json: @project.errors.to_hash
end
end
end