Skip to content
代码片段 群组 项目
提交 1d596ea4 编辑于 作者: Kassio Borges's avatar Kassio Borges
浏览文件

Fix pages path_prefix ci variable expansion

Related to: https://gitlab.com/gitlab-org/gitlab/-/issues/433444

Changelog: fixed
EE: true
上级 6f547686
No related branches found
No related tags found
无相关合并请求
......@@ -223,7 +223,7 @@ def pages
(options&.dig(:pages) || {}).tap do |pages_options|
if ::Gitlab::Pages.multiple_versions_enabled_for?(project)
pages_options[:path_prefix] = ExpandVariables.expand(pages_options[:path_prefix], -> {
pages_options[:path_prefix] = ExpandVariables.expand(pages_options[:path_prefix].to_s, -> {
variables.sort_and_expand_all
})
else
......
......@@ -985,6 +985,7 @@
false | false | { pages: { path_prefix: 'foo' } } | {}
false | true | { pages: { path_prefix: 'foo' } } | {}
true | false | { pages: { path_prefix: 'foo' } } | {}
true | true | { pages: { path_prefix: nil } } | { path_prefix: '' }
true | true | { pages: { path_prefix: 'foo' } } | { path_prefix: 'foo' }
true | true | { pages: { path_prefix: '$CI_COMMIT_BRANCH' } } | { path_prefix: 'master' }
end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册