Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6be19afa
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,发现更多精彩内容 >>
提交
6be19afa
编写于
6月 12, 2020
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
831d46a9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
9 deletion
+9
-9
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
.gitlab/ci/frontend.gitlab-ci.yml
.gitlab/ci/frontend.gitlab-ci.yml
+1
-1
.gitlab/ci/global.gitlab-ci.yml
.gitlab/ci/global.gitlab-ci.yml
+2
-2
doc/install/installation.md
doc/install/installation.md
+4
-4
spec/frontend/jobs/components/log/mock_data.js
spec/frontend/jobs/components/log/mock_data.js
+1
-1
未找到文件。
.gitlab-ci.yml
浏览文件 @
6be19afa
...
...
@@ -15,7 +15,7 @@ stages:
# in cases where jobs require Docker-in-Docker, the job
# definition must be extended with `.use-docker-in-docker`
default
:
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.2
6-lfs-2.9-chrome-73.0
-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.2
7-lfs-2.9-chrome-83
-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
tags
:
-
gitlab-org
# All jobs are interruptible by default
...
...
.gitlab/ci/frontend.gitlab-ci.yml
浏览文件 @
6be19afa
...
...
@@ -11,7 +11,7 @@
.compile-assets-base
:
extends
:
.frontend-base
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-git-2.2
6
-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-git-2.2
7
-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34
stage
:
prepare
script
:
-
node --version
...
...
.gitlab/ci/global.gitlab-ci.yml
浏览文件 @
6be19afa
...
...
@@ -64,7 +64,7 @@
policy
:
pull
.use-pg11
:
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.2
6-lfs-2.9-chrome-73.0
-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.2
7-lfs-2.9-chrome-83
-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
services
:
-
name
:
postgres:11.6
command
:
[
"
postgres"
,
"
-c"
,
"
fsync=off"
,
"
-c"
,
"
synchronous_commit=off"
,
"
-c"
,
"
full_page_writes=off"
]
...
...
@@ -73,7 +73,7 @@
POSTGRES_HOST_AUTH_METHOD
:
trust
.use-pg11-ee
:
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.2
6-lfs-2.9-chrome-73.0
-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.2
7-lfs-2.9-chrome-83
-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
services
:
-
name
:
postgres:11.6
command
:
[
"
postgres"
,
"
-c"
,
"
fsync=off"
,
"
-c"
,
"
synchronous_commit=off"
,
"
-c"
,
"
full_page_writes=off"
]
...
...
doc/install/installation.md
浏览文件 @
6be19afa
...
...
@@ -134,7 +134,7 @@ Make sure you have the right version of Git installed:
# Install Git
sudo
apt-get
install
-y
git-core
# Make sure Git is version 2.2
6.2 or higher (minimal supported version is 2.24
.0)
# Make sure Git is version 2.2
7.0 or higher (minimal supported version is 2.25
.0)
git
--version
```
...
...
@@ -181,9 +181,9 @@ sudo make install
# Download and compile from source
cd
/tmp
curl
--remote-name
--location
--progress
https://www.kernel.org/pub/software/scm/git/git-2.2
6.2
.tar.gz
echo
'
e1c17777528f55696815ef33587b1d20f5eec246669f3b839d15dbfffad9c121 git-2.26.2.tar.gz'
| shasum
-a256
-c
-
&&
tar
-xzf
git-2.26.2
.tar.gz
cd
git-2.2
6.2
/
curl
--remote-name
--location
--progress
https://www.kernel.org/pub/software/scm/git/git-2.2
7.0
.tar.gz
echo
'
77ded85cbe42b1ffdc2578b460a1ef5d23bcbc6683eabcafbb0d394dffe2e787 git-2.27.0.tar.gz'
| shasum
-a256
-c
-
&&
tar
-xzf
git-2.27.0
.tar.gz
cd
git-2.2
7.0
/
./configure
--with-libpcre
make
prefix
=
/usr/local all
...
...
spec/frontend/jobs/components/log/mock_data.js
浏览文件 @
6be19afa
...
...
@@ -34,7 +34,7 @@ export const utilsMockData = [
content
:
[
{
text
:
'
Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.
5-golang-1.12-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6
-graphicsmagick-1.3.34
'
,
'
Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.
6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11
-graphicsmagick-1.3.34
'
,
},
],
section
:
'
prepare-executor
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录