Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d07169c8
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,体验更适合开发者的 AI 搜索 >>
提交
d07169c8
编写于
12月 04, 2019
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
6377f3e2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
6 deletion
+22
-6
doc/ci/docker/using_docker_images.md
doc/ci/docker/using_docker_images.md
+14
-2
doc/development/testing_guide/end_to_end/resources.md
doc/development/testing_guide/end_to_end/resources.md
+3
-0
spec/features/groups/settings/group_badges_spec.rb
spec/features/groups/settings/group_badges_spec.rb
+3
-2
spec/features/projects/settings/project_badges_spec.rb
spec/features/projects/settings/project_badges_spec.rb
+2
-2
未找到文件。
doc/ci/docker/using_docker_images.md
浏览文件 @
d07169c8
...
...
@@ -576,8 +576,8 @@ There are two ways to determine the value of `DOCKER_AUTH_CONFIG`:
will use the available system keystore to store the result of
`docker
login`
. In that case, it's impossible to read
`~/.docker/config.json`
,
so you will need to prepare the required base64-encoded version of
`${username}:${password}`
manually. Open a terminal and execute the
following command:
`${username}:${password}`
and create the Docker configuration JSON manually.
Open a terminal and execute the
following command:
```
bash
echo
-n
"my_username:my_password"
|
base64
...
...
@@ -585,6 +585,18 @@ There are two ways to determine the value of `DOCKER_AUTH_CONFIG`:
# Example output to copy
bXlfdXNlcm5hbWU6bXlfcGFzc3dvcmQ
=
```
Create the Docker JSON configuration content as follows:
```
json
{
"auths"
:
{
"registry.example.com:5000"
:
{
"auth"
:
"(Base64 content from above)"
}
}
}
```
#### Configuring a job
...
...
doc/development/testing_guide/end_to_end/resources.md
浏览文件 @
d07169c8
...
...
@@ -44,6 +44,9 @@ create the resource via the public GitLab API:
-
`#api_post_path`
: The
`POST`
path to create a new resource.
-
`#api_post_body`
: The
`POST`
body (as a Ruby hash) to create a new resource.
> Be aware that many API resources are [paginated](../../../api/README.md#pagination).
> If you don't find the results you expect, check if there is more that one page of results.
Let's take the
`Shirt`
resource class, and add these three API methods:
```
ruby
...
...
spec/features/groups/settings/group_badges_spec.rb
浏览文件 @
d07169c8
...
...
@@ -7,8 +7,9 @@ describe 'Group Badges' do
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:badge_link_url
)
{
'https://gitlab.com/gitlab-org/gitlab/commits/master'
}
let
(
:badge_image_url
)
{
'https://gitlab.com/gitlab-org/gitlab/badges/master/build.svg'
}
let
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
let
(
:badge_link_url
)
{
"http://
#{
page
.
server
.
host
}
:
#{
page
.
server
.
port
}
/
#{
project
.
full_path
}
/commits/master"
}
let
(
:badge_image_url
)
{
"http://
#{
page
.
server
.
host
}
:
#{
page
.
server
.
port
}
/
#{
project
.
full_path
}
/badges/master/pipeline.svg"
}
let!
(
:badge_1
)
{
create
(
:group_badge
,
group:
group
)
}
let!
(
:badge_2
)
{
create
(
:group_badge
,
group:
group
)
}
...
...
spec/features/projects/settings/project_badges_spec.rb
浏览文件 @
d07169c8
...
...
@@ -8,8 +8,8 @@ describe 'Project Badges' do
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
let
(
:badge_link_url
)
{
'https://gitlab.com/gitlab-org/gitlab/commits/master'
}
let
(
:badge_image_url
)
{
'https://gitlab.com/gitlab-org/gitlab/badges/master/build.svg'
}
let
(
:badge_link_url
)
{
"http://
#{
page
.
server
.
host
}
:
#{
page
.
server
.
port
}
/
#{
project
.
full_path
}
/commits/master"
}
let
(
:badge_image_url
)
{
"http://
#{
page
.
server
.
host
}
:
#{
page
.
server
.
port
}
/
#{
project
.
full_path
}
/badges/master/pipeline.svg"
}
let!
(
:project_badge
)
{
create
(
:project_badge
,
project:
project
)
}
let!
(
:group_badge
)
{
create
(
:group_badge
,
group:
group
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录