diff options
author | Tristan Williams <2390023-tristan@users.noreply.gitlab.com> | 2019-08-26 11:18:49 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-26 11:18:49 +0300 |
commit | 6c7638dde120385f7cb1f2759f2865c6b0966117 (patch) | |
tree | 2ee34e0bc2ffc6712fcfec428554201231765aed /doc | |
parent | 084f96ee81b9669ac562bd0ba9a73794af4fa526 (diff) |
Docs: Replace old screenshots in project forking workflow
Diffstat (limited to 'doc')
-rw-r--r-- | doc/workflow/forking/branch_select.png | bin | 15410 -> 18042 bytes | |||
-rw-r--r-- | doc/workflow/forking/merge_request.png | bin | 16329 -> 24625 bytes | |||
-rw-r--r-- | doc/workflow/forking_workflow.md | 7 | ||||
-rw-r--r-- | doc/workflow/img/forking_workflow_choose_namespace.png | bin | 26275 -> 35084 bytes | |||
-rw-r--r-- | doc/workflow/img/forking_workflow_fork_button.png | bin | 12962 -> 25754 bytes | |||
-rw-r--r-- | doc/workflow/img/forking_workflow_path_taken_error.png | bin | 10092 -> 21497 bytes |
6 files changed, 3 insertions, 4 deletions
diff --git a/doc/workflow/forking/branch_select.png b/doc/workflow/forking/branch_select.png Binary files differindex 77236137190..0ea5410f832 100644 --- a/doc/workflow/forking/branch_select.png +++ b/doc/workflow/forking/branch_select.png diff --git a/doc/workflow/forking/merge_request.png b/doc/workflow/forking/merge_request.png Binary files differindex 407ddfb4799..43851203f3f 100644 --- a/doc/workflow/forking/merge_request.png +++ b/doc/workflow/forking/merge_request.png diff --git a/doc/workflow/forking_workflow.md b/doc/workflow/forking_workflow.md index 869a0a621c3..82c2709143d 100644 --- a/doc/workflow/forking_workflow.md +++ b/doc/workflow/forking_workflow.md @@ -10,8 +10,7 @@ document more information about using branches to work together. Forking a project is in most cases a two-step process. -1. Click on the fork button located in the middle of the page or a project's - home page right next to the stars button. +1. Click on the fork button located located in between the star and clone buttons on the project's home page. ![Fork button](img/forking_workflow_fork_button.png) @@ -25,7 +24,7 @@ Forking a project is in most cases a two-step process. **Note:** If the namespace you chose to fork the project to has another project with the same path name, you will be presented with a warning that the forking - could not be completed. Try to resolve the error and repeat the forking + could not be completed. Try to resolve the error before repeating the forking process. ![Path taken error](img/forking_workflow_path_taken_error.png) @@ -44,7 +43,7 @@ create the [merge request](merge_requests.md). ![Selecting branches](forking/branch_select.png) You can then assign the merge request to someone to have them review -your changes. Upon pressing the 'Accept Merge Request' button, your +your changes. Upon pressing the 'Submit Merge Request' button, your changes will be added to the repository and branch you're merging into. ![New merge request](forking/merge_request.png) diff --git a/doc/workflow/img/forking_workflow_choose_namespace.png b/doc/workflow/img/forking_workflow_choose_namespace.png Binary files differindex b34b12090a1..eb023ca85f2 100644 --- a/doc/workflow/img/forking_workflow_choose_namespace.png +++ b/doc/workflow/img/forking_workflow_choose_namespace.png diff --git a/doc/workflow/img/forking_workflow_fork_button.png b/doc/workflow/img/forking_workflow_fork_button.png Binary files differindex 941d5363c35..7fb07529b6d 100644 --- a/doc/workflow/img/forking_workflow_fork_button.png +++ b/doc/workflow/img/forking_workflow_fork_button.png diff --git a/doc/workflow/img/forking_workflow_path_taken_error.png b/doc/workflow/img/forking_workflow_path_taken_error.png Binary files differindex df938da5677..ef62d0ab6a9 100644 --- a/doc/workflow/img/forking_workflow_path_taken_error.png +++ b/doc/workflow/img/forking_workflow_path_taken_error.png |