... | @@ -50,18 +50,18 @@ Branches can be merged into the default (master) branch. This is what merge requ |
... | @@ -50,18 +50,18 @@ Branches can be merged into the default (master) branch. This is what merge requ |
|
You can mark a merge request as a *Work in Progress* to indicate that you're not done yet by putting `WIP:` in front of the title. Once you're done you can remove the WIP status.
|
|
You can mark a merge request as a *Work in Progress* to indicate that you're not done yet by putting `WIP:` in front of the title. Once you're done you can remove the WIP status.
|
|
|
|
|
|
## The Workflow
|
|
## The Workflow
|
|
* Start with an issue that has the ![To do](uploads/d64ebf301b436ca0b2ab5e13e8a02970/image.png) label
|
|
1. Start with an issue that has the ![To do](uploads/d64ebf301b436ca0b2ab5e13e8a02970/image.png) label
|
|
* Optionally, start with a ![beginner-task](uploads/fffce66da21ae99393b91b76fbd0c3e2/image.png)
|
|
>Optionally, start with a ![beginner-task](uploads/fffce66da21ae99393b91b76fbd0c3e2/image.png)
|
|
* Remove the ![To do](uploads/d64ebf301b436ca0b2ab5e13e8a02970/image.png) label and add ![Doing](uploads/5e5a76750a1b80c10053ecf2946f6cef/image.png)
|
|
2. Remove the ![To do](uploads/d64ebf301b436ca0b2ab5e13e8a02970/image.png) label and add ![Doing](uploads/5e5a76750a1b80c10053ecf2946f6cef/image.png)
|
|
* *Tip:* you can do this at once by drag-and-dropping the issue on the issue board
|
|
>You can do this at once by drag-and-dropping the issue on the issue board
|
|
* Create a new branch to make your changes on. You can do this manually or have GitLab create one for you including a WIP merge request by clicking ![Create merge request](uploads/dd3c1a838800a771b5605a6590db31dc/image.png)
|
|
3. Create a new branch to make your changes on. You can do this manually or have GitLab create one for you including a WIP merge request by clicking ![Create merge request](uploads/dd3c1a838800a771b5605a6590db31dc/image.png)
|
|
* Once you're done with the task, label the issue as ![Done](uploads/ee6ddea2267032bd5aabf38c6f2979ca/image.png) and resolve the merge request's WIP status ![resolve WIP status](uploads/e84342b4ed1106964920a0b6829ba140/image.png). It's now time for someone to review your changes.
|
|
4. Once you're done with the task, label the issue as ![Done](uploads/ee6ddea2267032bd5aabf38c6f2979ca/image.png) and resolve the merge request's WIP status ![resolve WIP status](uploads/e84342b4ed1106964920a0b6829ba140/image.png). It's now time for someone to review your changes.
|
|
|
|
5. It can go two ways from here:
|
|
It can go two ways from here:
|
|
|
|
* We are happy with what you've done and accept your changes. Your merge request will be merged into `master`.
|
|
1. We are happy with what you've done and accept your changes. Your merge request will be merged into `master`.
|
|
* We would like you to change some things. In this case, we'll comment what should be different and set the issue to ![To do](uploads/d64ebf301b436ca0b2ab5e13e8a02970/image.png) and the merge request to WIP again.
|
|
2. We would like you to change some things. In this case, we'll comment what should be different and set the issue to ![To do](uploads/d64ebf301b436ca0b2ab5e13e8a02970/image.png) and the merge request to WIP again.
|
|
|
|
|
|
We check `Done` issues and non-WIP merge requests regurlarly and give you feedback in the comments.
|
|
We check ![Done](uploads/ee6ddea2267032bd5aabf38c6f2979ca/image.png) issues and non-WIP merge requests regurlarly and give you feedback in the comments.
|
|
|
|
|
|
# More information from GitLab
|
|
# More information from GitLab
|
|
There are help pages for every interaction with Gitlab [here](https://gitlab.linguala.com/help) or on the top right where the question mark is.
|
|
There are help pages for every interaction with Gitlab [here](https://gitlab.linguala.com/help) or on the top right where the question mark is.
|
... | | ... | |