diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-30 18:22:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-30 18:22:03 +0300 |
commit | 0cb369aa5f70b59e5922d8f5431a3302fd93574e (patch) | |
tree | d8ac59d000141ebe9f1f7eda188dd1d32ff7cc39 /lib/api | |
parent | b5e7de21d8f1d479f24826198e6e54920cc29598 (diff) |
Add latest changes from gitlab-org/security/gitlab@13-5-stable-ee
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/terraform/state.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/api/terraform/state.rb b/lib/api/terraform/state.rb index 4168cce21ef..3dbde4639ca 100644 --- a/lib/api/terraform/state.rb +++ b/lib/api/terraform/state.rb @@ -39,7 +39,6 @@ module API env['api.format'] = :binary # this bypasses json serialization body state.latest_file.read - status :ok end end @@ -53,8 +52,10 @@ module API remote_state_handler.handle_with_lock do |state| state.update_file!(CarrierWaveStringFile.new(data), version: params[:serial]) - status :ok end + + body false + status :ok end desc 'Delete a terraform state of a certain name' @@ -64,8 +65,10 @@ module API remote_state_handler.handle_with_lock do |state| state.destroy! - status :ok end + + body false + status :ok end desc 'Lock a terraform state of a certain name' |