summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2015-01-23 11:18:10 -0800
committerSytse Sijbrandij <sytse@gitlab.com>2015-01-23 11:18:10 -0800
commit061ac7923670083cf7237a32867b2f8ce86a1c83 (patch)
tree07bbcc451f2bb303e6dac9eca44d17ea2385318d /doc/workflow
parentc6e24850a3ad662d82f8e0812eb2a38df4f43c13 (diff)
downloadgitlab-ce-061ac7923670083cf7237a32867b2f8ce86a1c83.tar.gz
Rename workflow to feature branch flow and add better desciption of workflow category.
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/README.md2
-rw-r--r--doc/workflow/workflow.md2
2 files changed, 2 insertions, 2 deletions
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: