Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 03:10:15 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 03:10:15 +0300
commit46aea02972d6caaf34a11689e9e6ccfa9dcb538a (patch)
tree5e4e71724bdab97d6d3f57ed25e11e0c516383fb /doc/development/rake_tasks.md
parent83d921d51bd5bf8bd0ecd078706d7c037fb711cb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/rake_tasks.md')
-rw-r--r--doc/development/rake_tasks.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md
index 3860665024a..8d20c2b738e 100644
--- a/doc/development/rake_tasks.md
+++ b/doc/development/rake_tasks.md
@@ -236,7 +236,7 @@ task, then check the dimensions of the new sprite sheet and update the
## Update project templates
Starting a project from a template needs this project to be exported. On a
-up to date master branch run:
+up to date main branch run:
```shell
gdk start
@@ -247,7 +247,7 @@ git commit
git push -u origin update-project-templates
```
-Now create a merge request and merge that to master.
+Now create a merge request and merge that to main.
## Generate route lists