Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
281978c3
Commit
281978c3
authored
Aug 07, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
fc878b6c
2b7218cf
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+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
No files found.
.gitlab-ci.yml
View file @
281978c3
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
View file @
281978c3
...
@@ -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
View file @
281978c3
...
@@ -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
View file @
281978c3
...
@@ -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
View file @
281978c3
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment