Merge branch 'gitlab-flow' of gitlab.com:gitlab-org/gitlab-ce into gitlab-flow

15f01b6a · Sytse Sijbrandij · 4df15fe3 · 5121fce1 · 15f01b6a · 15f01b6a
Commit 15f01b6a authored Sep 29, 2014 by Sytse Sijbrandij
15 changed files
--- a/doc/workflow/ci_mr.png
+++ b/doc/workflow/ci_mr.png
--- a/doc/workflow/close_issue_mr.png
+++ b/doc/workflow/close_issue_mr.png
--- a/doc/workflow/environment_branches.png
+++ b/doc/workflow/environment_branches.png
--- a/doc/workflow/git_pull.png
+++ b/doc/workflow/git_pull.png
--- a/doc/workflow/github_flow.png
+++ b/doc/workflow/github_flow.png
--- a/doc/workflow/gitlab_flow.md
+++ b/doc/workflow/gitlab_flow.md
--- a/doc/workflow/good_commit.png
+++ b/doc/workflow/good_commit.png
--- a/doc/workflow/merge_commits.png
+++ b/doc/workflow/merge_commits.png
--- a/doc/workflow/merge_request.png
+++ b/doc/workflow/merge_request.png
--- a/doc/workflow/mr_inline_comments.png
+++ b/doc/workflow/mr_inline_comments.png
--- a/doc/workflow/production_branch.png
+++ b/doc/workflow/production_branch.png
--- a/doc/workflow/rebase.png
+++ b/doc/workflow/rebase.png
--- a/doc/workflow/release_branches.png
+++ b/doc/workflow/release_branches.png
--- a/doc/workflow/remove_checkbox.png
+++ b/doc/workflow/remove_checkbox.png
--- a/doc/workflow/voting_slider.png
+++ b/doc/workflow/voting_slider.png