diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /doc/development/rake_tasks.md | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'doc/development/rake_tasks.md')
-rw-r--r-- | doc/development/rake_tasks.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md index c6c3d39c57f..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 @@ -263,7 +263,7 @@ RESTful API verbs. For the Rails controllers, run: ```shell -bundle exec rake routes +bundle exec rails routes ``` Since these take some time to create, it's often helpful to save the output to |