From 074d013e1eb3f6e0c27f96a3be8b9361254c8a98 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 23 Mar 2020 15:09:36 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 scripts/trigger-build-docs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/trigger-build-docs b/scripts/trigger-build-docs
index ea717d9ccbf..70e7150d475 100755
--- a/scripts/trigger-build-docs
+++ b/scripts/trigger-build-docs
@@ -21,7 +21,13 @@ GITLAB_DOCS_REPO = 'gitlab-org/gitlab-docs'.freeze
 # kicked the review app.
 #
 def docs_branch
-  "docs-preview-#{slug}-#{ENV["CI_MERGE_REQUEST_IID"]}"
+  # Check if CI_MERGE_REQUEST_IID is present. This requires pipelines
+  # for merge requests to be enabled.
+  if ENV["CI_MERGE_REQUEST_IID"].nil?
+    "docs-preview-#{slug}-#{ENV["CI_COMMIT_REF_SLUG"]}"
+  else
+    "docs-preview-#{slug}-#{ENV["CI_MERGE_REQUEST_IID"]}"
+  end
 end
 
 #
-- 
cgit v1.2.3