summaryrefslogtreecommitdiff
path: root/scripts/trigger-build-docs
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-11-20 15:14:32 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-11-20 15:14:32 +0000
commitce4dd9a75eff69f121e3864e6c4c2c2ea24ade01 (patch)
tree6b2d07038c84b99304ee2ce80a7696511d676392 /scripts/trigger-build-docs
parentb9a8680c8fbff36e60ba52ab61e1a652e0fad06e (diff)
parent190ea021cd1fd89d20c9548a72034a7b941413ca (diff)
downloadgitlab-ce-remove-pretty-time.tar.gz
Merge branch 'master' into remove-pretty-timeremove-pretty-time
* master: Add MR reference to logs Don't move project repository/attachments when using hashed storage Clean up schema of the "merge_requests" table Update pipeline status badge details docs Fix offense to the LineBreakAfterGuardClauses cop schedules.md: fix only-and-except anchor link Changed validation error message on wrong milestone dates Fix conflict highlighting Use slug as the prefix for the docs CI job preview URL Add logs for monitoring the merge process
Diffstat (limited to 'scripts/trigger-build-docs')
-rwxr-xr-xscripts/trigger-build-docs2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/trigger-build-docs b/scripts/trigger-build-docs
index 89ad6a99467..a270823b857 100755
--- a/scripts/trigger-build-docs
+++ b/scripts/trigger-build-docs
@@ -27,7 +27,7 @@ def docs_branch
# Prefix the remote branch with 'preview-' in order to avoid
# name conflicts in the rare case the branch name already
# exists in the docs repo and truncate to max length.
- "preview-#{ENV["CI_COMMIT_REF_SLUG"]}"[0...max]
+ "#{slug}-#{ENV["CI_COMMIT_REF_SLUG"]}"[0...max]
end
#