Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2b7218cf
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,发现更多精彩内容 >>
提交
2b7218cf
编写于
8月 07, 2019
作者:
D
Douglas Barbosa Alexandre
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'zj-bump-git-2.22' into 'master'
Use Git 2.22 for GitLab See merge request gitlab-org/gitlab-ce!31578
上级
8d659869
3ace5766
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
8 addition
and
8 deletion
+8
-8
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
.gitlab/ci/frontend.gitlab-ci.yml
.gitlab/ci/frontend.gitlab-ci.yml
+1
-1
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+1
-1
doc/install/installation.md
doc/install/installation.md
+4
-4
lib/system_check/app/git_version_check.rb
lib/system_check/app/git_version_check.rb
+1
-1
未找到文件。
.gitlab-ci.yml
浏览文件 @
2b7218cf
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.2
1
-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29"
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.2
2
-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29"
variables
:
variables
:
RAILS_ENV
:
"
test"
RAILS_ENV
:
"
test"
...
...
.gitlab/ci/frontend.gitlab-ci.yml
浏览文件 @
2b7218cf
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
.gitlab:assets:compile-metadata:
.gitlab:assets:compile-metadata:
<<
:
*assets-compile-cache
<<
:
*assets-compile-cache
extends
:
.dedicated-no-docs-pull-cache-job
extends
:
.dedicated-no-docs-pull-cache-job
image
:
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.2
1
-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.29-docker-18.06.1
image
:
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.2
2
-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.29-docker-18.06.1
dependencies
:
dependencies
:
-
setup-test-env
-
setup-test-env
services
:
services
:
...
...
.gitlab/ci/rails.gitlab-ci.yml
浏览文件 @
2b7218cf
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
.rspec-metadata-pg-10
:
&rspec-metadata-pg-10
.rspec-metadata-pg-10
:
&rspec-metadata-pg-10
<<
:
*rspec-metadata
<<
:
*rspec-metadata
<<
:
*use-pg-10
<<
:
*use-pg-10
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.2
1
-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.29"
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.2
2
-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.29"
# DB migration, rollback, and seed jobs
# DB migration, rollback, and seed jobs
.db-migrate-reset
:
&db-migrate-reset
.db-migrate-reset
:
&db-migrate-reset
...
...
doc/install/installation.md
浏览文件 @
2b7218cf
...
@@ -134,7 +134,7 @@ Make sure you have the right version of Git installed:
...
@@ -134,7 +134,7 @@ Make sure you have the right version of Git installed:
# Install Git
# Install Git
sudo
apt-get
install
-y
git-core
sudo
apt-get
install
-y
git-core
# Make sure Git is version 2.2
1
.0 or higher
# Make sure Git is version 2.2
2
.0 or higher
git
--version
git
--version
```
```
...
@@ -171,9 +171,9 @@ sudo make install
...
@@ -171,9 +171,9 @@ sudo make install
# Download and compile from source
# Download and compile from source
cd
/tmp
cd
/tmp
curl
--remote-name
--location
--progress
https://www.kernel.org/pub/software/scm/git/git-2.2
1
.0.tar.gz
curl
--remote-name
--location
--progress
https://www.kernel.org/pub/software/scm/git/git-2.2
2
.0.tar.gz
echo
'
85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee git-2.21.0.tar.gz'
| shasum
-a256
-c
-
&&
tar
-xzf
git-2.21
.0.tar.gz
echo
'
a4b7e4365bee43caa12a38d646d2c93743d755d1cea5eab448ffb40906c9da0b'
git-2.22.0.tar.gz
' | shasum -a256 -c - && tar -xzf git-2.22
.0.tar.gz
cd
git-2.2
1
.0/
cd git-2.2
2
.0/
./configure --with-libpcre
./configure --with-libpcre
make prefix=/usr/local all
make prefix=/usr/local all
...
...
lib/system_check/app/git_version_check.rb
浏览文件 @
2b7218cf
...
@@ -7,7 +7,7 @@ module SystemCheck
...
@@ -7,7 +7,7 @@ module SystemCheck
set_check_pass
->
{
"yes (
#{
self
.
current_version
}
)"
}
set_check_pass
->
{
"yes (
#{
self
.
current_version
}
)"
}
def
self
.
required_version
def
self
.
required_version
@required_version
||=
Gitlab
::
VersionInfo
.
parse
(
'2.2
1
.0'
)
@required_version
||=
Gitlab
::
VersionInfo
.
parse
(
'2.2
2
.0'
)
end
end
def
self
.
current_version
def
self
.
current_version
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录