Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
937e7f9e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
937e7f9e
编写于
3月 13, 2018
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make predefined variables in a collection public by default
上级
0cf0a7a8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
15 deletion
+15
-15
app/models/project.rb
app/models/project.rb
+9
-9
lib/gitlab/ci/variables/collection/item.rb
lib/gitlab/ci/variables/collection/item.rb
+1
-1
spec/lib/gitlab/ci/variables/collection_spec.rb
spec/lib/gitlab/ci/variables/collection_spec.rb
+1
-1
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+4
-4
未找到文件。
app/models/project.rb
浏览文件 @
937e7f9e
...
...
@@ -1574,13 +1574,13 @@ class Project < ActiveRecord::Base
visibility
=
Gitlab
::
VisibilityLevel
.
string_level
(
visibility_level
)
Gitlab
::
Ci
::
Variables
::
Collection
.
new
.
tap
do
|
variables
|
variables
.
append
(
key:
'CI_PROJECT_ID'
,
value:
id
.
to_s
,
public:
true
)
variables
.
append
(
key:
'CI_PROJECT_NAME'
,
value:
path
,
public:
true
)
variables
.
append
(
key:
'CI_PROJECT_PATH'
,
value:
full_path
,
public:
true
)
variables
.
append
(
key:
'CI_PROJECT_PATH_SLUG'
,
value:
full_path_slug
,
public:
true
)
variables
.
append
(
key:
'CI_PROJECT_NAMESPACE'
,
value:
namespace
.
full_path
,
public:
true
)
variables
.
append
(
key:
'CI_PROJECT_URL'
,
value:
web_url
,
public:
true
)
variables
.
append
(
key:
'CI_PROJECT_VISIBILITY'
,
value:
visibility
,
public:
true
)
variables
.
append
(
key:
'CI_PROJECT_ID'
,
value:
id
.
to_s
)
variables
.
append
(
key:
'CI_PROJECT_NAME'
,
value:
path
)
variables
.
append
(
key:
'CI_PROJECT_PATH'
,
value:
full_path
)
variables
.
append
(
key:
'CI_PROJECT_PATH_SLUG'
,
value:
full_path_slug
)
variables
.
append
(
key:
'CI_PROJECT_NAMESPACE'
,
value:
namespace
.
full_path
)
variables
.
append
(
key:
'CI_PROJECT_URL'
,
value:
web_url
)
variables
.
append
(
key:
'CI_PROJECT_VISIBILITY'
,
value:
visibility
)
variables
.
concat
(
container_registry_variables
)
variables
.
concat
(
auto_devops_variables
)
end
...
...
@@ -1590,10 +1590,10 @@ class Project < ActiveRecord::Base
Gitlab
::
Ci
::
Variables
::
Collection
.
new
.
tap
do
|
variables
|
return
variables
unless
Gitlab
.
config
.
registry
.
enabled
variables
.
append
(
key:
'CI_REGISTRY'
,
value:
Gitlab
.
config
.
registry
.
host_port
,
public:
true
)
variables
.
append
(
key:
'CI_REGISTRY'
,
value:
Gitlab
.
config
.
registry
.
host_port
)
if
container_registry_enabled?
variables
.
append
(
key:
'CI_REGISTRY_IMAGE'
,
value:
container_registry_url
,
public:
true
)
variables
.
append
(
key:
'CI_REGISTRY_IMAGE'
,
value:
container_registry_url
)
end
end
end
...
...
lib/gitlab/ci/variables/collection/item.rb
浏览文件 @
937e7f9e
...
...
@@ -9,7 +9,7 @@ module Gitlab
@variable
=
{
key:
options
.
fetch
(
:key
),
value:
options
.
fetch
(
:value
),
public:
options
.
fetch
(
:public
,
fals
e
),
public:
options
.
fetch
(
:public
,
tru
e
),
file:
options
.
fetch
(
:files
,
false
)
}
end
...
...
spec/lib/gitlab/ci/variables/collection_spec.rb
浏览文件 @
937e7f9e
...
...
@@ -58,7 +58,7 @@ describe Gitlab::Ci::Variables::Collection do
collection
=
described_class
.
new
([{
key:
'TEST'
,
value:
1
}])
expect
(
collection
.
to_runner_variables
)
.
to
eq
[{
key:
'TEST'
,
value:
1
,
public:
fals
e
}]
.
to
eq
[{
key:
'TEST'
,
value:
1
,
public:
tru
e
}]
end
end
end
spec/models/ci/build_spec.rb
浏览文件 @
937e7f9e
...
...
@@ -1835,10 +1835,10 @@ describe Ci::Build do
end
context
'returns variables in valid order'
do
let
(
:build_pre_var
)
{
{
key:
'build'
,
value:
'value'
}
}
let
(
:project_pre_var
)
{
{
key:
'project'
,
value:
'value'
}
}
let
(
:pipeline_pre_var
)
{
{
key:
'pipeline'
,
value:
'value'
}
}
let
(
:build_yaml_var
)
{
{
key:
'yaml'
,
value:
'value'
}
}
let
(
:build_pre_var
)
{
{
key:
'build'
,
value:
'value'
,
public:
true
}
}
let
(
:project_pre_var
)
{
{
key:
'project'
,
value:
'value'
,
public:
true
}
}
let
(
:pipeline_pre_var
)
{
{
key:
'pipeline'
,
value:
'value'
,
public:
true
}
}
let
(
:build_yaml_var
)
{
{
key:
'yaml'
,
value:
'value'
,
public:
true
}
}
before
do
allow
(
build
).
to
receive
(
:predefined_variables
)
{
[
build_pre_var
]
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录