summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-01-30 00:44:53 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-02-05 18:58:19 +0100
commitb48d8c8ad0bb2874db6b4c9accb3bebd19e9f2c8 (patch)
treeb3639bb715f458a6023e7f4556cb3ffcb4167aa8 /app/controllers
parent9eb3bb5cffbd18a744be2553ab2be7cb7843b029 (diff)
downloadgitlab-ce-b48d8c8ad0bb2874db6b4c9accb3bebd19e9f2c8.tar.gz
Return all variables after UPDATE
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/groups/variables_controller.rb7
-rw-r--r--app/controllers/projects/variables_controller.rb7
2 files changed, 12 insertions, 2 deletions
diff --git a/app/controllers/groups/variables_controller.rb b/app/controllers/groups/variables_controller.rb
index c0eff63da18..afa98aa8267 100644
--- a/app/controllers/groups/variables_controller.rb
+++ b/app/controllers/groups/variables_controller.rb
@@ -16,7 +16,12 @@ module Groups
def update
respond_to do |format|
format.json do
- return head :ok if @group.update(variables_params)
+ if @group.update(variables_params)
+ variables = @group.variables
+ .map { |variable| variable.present(current_user: current_user) }
+
+ return render status: :ok, json: { variables: variables }
+ end
render status: :bad_request, json: @group.errors.full_messages
end
diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb
index 2f03603bd1d..58fa600eb34 100644
--- a/app/controllers/projects/variables_controller.rb
+++ b/app/controllers/projects/variables_controller.rb
@@ -15,7 +15,12 @@ class Projects::VariablesController < Projects::ApplicationController
def update
respond_to do |format|
format.json do
- return head :ok if @project.update(variables_params)
+ if @project.update(variables_params)
+ variables = @project.variables
+ .map { |variable| variable.present(current_user: current_user) }
+
+ return render status: :ok, json: { variables: variables }
+ end
render status: :bad_request, json: @project.errors.full_messages
end