diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/internal/base.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/ci/templates/Terraform.gitlab-ci.yml | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/api/internal/base.rb b/lib/api/internal/base.rb index a926706f513..f1e33b27d2b 100644 --- a/lib/api/internal/base.rb +++ b/lib/api/internal/base.rb @@ -203,10 +203,6 @@ module API { reference_counter_increased: reference_counter_increased } end - post '/notify_post_receive' do - status 200 - end - post '/post_receive' do status 200 diff --git a/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml b/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml index dc70b977452..83483108fde 100644 --- a/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml @@ -12,6 +12,7 @@ image: # Default output file for Terraform plan variables: PLAN: plan.tfplan + JSON_PLAN_FILE: tfplan.json cache: paths: @@ -37,11 +38,13 @@ plan: stage: build script: - terraform plan -out=$PLAN - - "terraform show --json $PLAN | convert_report > tfplan.json" + - "terraform show --json $PLAN | convert_report > $JSON_PLAN_FILE" artifacts: name: plan paths: - $PLAN + reports: + terraform: $JSON_PLAN_FILE # Separate apply job for manual launching Terraform as it can be destructive # action. |