diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-11-20 15:14:12 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-11-20 15:14:12 +0000 |
commit | d04f326828b01f422d5aa47f73fa8c7705dd5225 (patch) | |
tree | e094ad1ec80395d8e40a982b2849bf2c61a938da /scripts/trigger-build-docs | |
parent | f0a779e2f8f880922dfd0cb772730a051a33c739 (diff) | |
parent | 190ea021cd1fd89d20c9548a72034a7b941413ca (diff) | |
download | gitlab-ce-4080-align-retry-btn.tar.gz |
Merge branch 'master' into 4080-align-retry-btn4080-align-retry-btn
* 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-x | scripts/trigger-build-docs | 2 |
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 # |