Merge branch 'master' into 'master'

Fix typo in readme.md

See merge request gitlab-org/gitlab!71728

README.md

@@ -68,7 +68,7 @@ GitLab is an open source project and we are very happy to accept community contr
 ## Install a development environment
 
 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.
+If you do not use the GitLab Development Kit you need to install and configure 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 Puma configuration file:
 
     cp config/puma.rb.example.development config/puma.rb