diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-25 18:02:39 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-25 18:02:39 +0000 |
| commit | 4c17e1b3dbb6c30345d52fc8c9789440f4fcb326 (patch) | |
| tree | 7d82b306e6aff981b6bd839ba2dade147c313ed2 /doc/workflow | |
| parent | bbd9a6fe405d0df1c7c9ad09b7c3ff6a0201953f (diff) | |
| parent | 4c8e9a8d27c34fe97216e12d17782f982818fb5c (diff) | |
| download | gitlab-ce-4c17e1b3dbb6c30345d52fc8c9789440f4fcb326.tar.gz | |
Merge branch 'zj-remove-gitorious' into 'master'
Remove gitorious
## What does this MR do?
Remove gitorious as import source
## Are there points in the code the reviewer needs to double check?
Did I remove everything?
## Why was this MR needed?
This button yielded a 404
## What are the relevant issue numbers?
Closes #17062
/cc @JobV
See merge request !5866
Diffstat (limited to 'doc/workflow')
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 8119324bb62..7c0eb90d540 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -115,7 +115,7 @@ In this flow it is not common to have a production branch (or git flow master br Merge or pull requests are created in a git management application and ask an assigned person to merge two branches. Tools such as GitHub and Bitbucket choose the name pull request since the first manual action would be to pull the feature branch. -Tools such as GitLab and Gitorious choose the name merge request since that is the final action that is requested of the assignee. +Tools such as GitLab and others choose the name merge request since that is the final action that is requested of the assignee. In this article we'll refer to them as merge requests. If you work on a feature branch for more than a few hours it is good to share the intermediate result with the rest of the team. |