summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-03 06:08:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-03 06:08:22 +0000
commitd72fedf168dafcb38bd51b67f86804738000fb48 (patch)
tree24c96e700e2560835aff28ab5e4ca599875019b5 /README.md
parent497b73152109b6da922e1a8ffd8ab193f7f3fcd3 (diff)
downloadgitlab-ce-d72fedf168dafcb38bd51b67f86804738000fb48.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 3e6ac1bf689..ca0a708da2e 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ GitLab is an open source project and we are very happy to accept community contr
To work on GitLab itself, we recommend setting up your development environment with [the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit).
If you do not use the GitLab Development Kit you need to install and setup all the dependencies yourself, this is a lot of work and error prone.
-One small thing you also have to do when installing it yourself is to copy the example development unicorn configuration file:
+One small thing you also have to do when installing it yourself is to copy the example development Unicorn configuration file:
cp config/unicorn.rb.example.development config/unicorn.rb
@@ -79,8 +79,8 @@ Instructions on how to start GitLab and how to run the tests can be found in the
GitLab is a Ruby on Rails application that runs on the following software:
- Ubuntu/Debian/CentOS/RHEL/OpenSUSE
-- Ruby (MRI) 2.6.5
-- Git 2.8.4+
+- Ruby (MRI) 2.6.6
+- Git 2.24+
- Redis 4.0+
- PostgreSQL 11+