diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-01-23 11:18:10 -0800 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-01-23 11:18:10 -0800 |
| commit | 061ac7923670083cf7237a32867b2f8ce86a1c83 (patch) | |
| tree | 07bbcc451f2bb303e6dac9eca44d17ea2385318d | |
| parent | c6e24850a3ad662d82f8e0812eb2a38df4f43c13 (diff) | |
| download | gitlab-ce-061ac7923670083cf7237a32867b2f8ce86a1c83.tar.gz | |
Rename workflow to feature branch flow and add better desciption of workflow category.
| -rw-r--r-- | doc/README.md | 2 | ||||
| -rw-r--r-- | doc/workflow/README.md | 2 | ||||
| -rw-r--r-- | doc/workflow/workflow.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/README.md b/doc/README.md index 3c8f8ad3d03..8c6d13e8506 100644 --- a/doc/README.md +++ b/doc/README.md @@ -9,7 +9,7 @@ - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects. - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects. - [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project. -- [Workflow](workflow/README.md) Learn how to get the maximum out of GitLab. +- [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN. ## Administrator documentation diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 1fe63274c29..33176aaba44 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -1,6 +1,6 @@ # Workflow -- [Workflow](workflow.md) +- [Feature branch workflow](workflow.md) - [Project Features](project_features.md) - [Authorization for merge requests](authorization_for_merge_requests.md) - [Groups](groups.md) diff --git a/doc/workflow/workflow.md b/doc/workflow/workflow.md index ab29cfb670b..f70e41df842 100644 --- a/doc/workflow/workflow.md +++ b/doc/workflow/workflow.md @@ -1,4 +1,4 @@ -# Workflow +# Feature branch workflow 1. Clone project: |