diff --git a/external/contribute/review/img/img1.png b/external/contribute/review/img/img1.png new file mode 100644 index 0000000000000000000000000000000000000000..dc6ffaccc4aa3bef0aa0beaedbf4a6acc3410ca6 --- /dev/null +++ b/external/contribute/review/img/img1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7174514c35aa95820fc4862e4a8573356b711f4704da8942058f23d24177bb97 +size 82656 diff --git a/external/contribute/review/img/img2.png b/external/contribute/review/img/img2.png new file mode 100644 index 0000000000000000000000000000000000000000..d6750e46b867fbf00beead0730153e64b7bf38dc --- /dev/null +++ b/external/contribute/review/img/img2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3a5c538eb39757c90e5e48d2216c67696c423742a8e873973b0b7cba300ae27 +size 90700 diff --git a/external/contribute/review/img/img3.png b/external/contribute/review/img/img3.png new file mode 100644 index 0000000000000000000000000000000000000000..313d043e078e6ad11f84bdaac7a46ad1aaa72c7e --- /dev/null +++ b/external/contribute/review/img/img3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97670a18ebf3bac512183db9a747580a78e2023a90c62d0181753a5d9a1a2b3f +size 9828 diff --git a/external/contribute/review/img/img4.png b/external/contribute/review/img/img4.png new file mode 100644 index 0000000000000000000000000000000000000000..89e9c680b5f26719e958a39e80c3079624549cab --- /dev/null +++ b/external/contribute/review/img/img4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a867e786e5ea4361242cf83a509c0c6718db7f4eaff46153024fd477c8c4f027 +size 17879 diff --git a/external/contribute/review/img/img5.png b/external/contribute/review/img/img5.png new file mode 100644 index 0000000000000000000000000000000000000000..2b2a2ff35c7a80d0c1154ded170f6adbab17a738 --- /dev/null +++ b/external/contribute/review/img/img5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d78b590ee91f2b75dd0083f25c868da714737c0dc4463b27e07104192a8b3b2a +size 48136 diff --git a/external/contribute/review/img/img6.png b/external/contribute/review/img/img6.png new file mode 100644 index 0000000000000000000000000000000000000000..35c8bb223788265838aee6fa403c141256fbe942 --- /dev/null +++ b/external/contribute/review/img/img6.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5f8dca90a37fe93776d0bb5c4aa8676cb00c2d09ce8b0f0b7e154dc29003914 +size 16408 diff --git a/external/contribute/review/img/img7.png b/external/contribute/review/img/img7.png new file mode 100644 index 0000000000000000000000000000000000000000..d16868a5584b868d7a13d3a8f04c29d0b150ff0c Binary files /dev/null and b/external/contribute/review/img/img7.png differ diff --git a/external/contribute/review/img/img8.png b/external/contribute/review/img/img8.png new file mode 100644 index 0000000000000000000000000000000000000000..89758356f1f431a132de06a040527f548b8bcc53 Binary files /dev/null and b/external/contribute/review/img/img8.png differ diff --git a/external/contribute/review/review.md b/external/contribute/review/review.md new file mode 100644 index 0000000000000000000000000000000000000000..6bfe6be50449a9186f0c61bf69cfc9a9bb2924a0 --- /dev/null +++ b/external/contribute/review/review.md @@ -0,0 +1,75 @@ +--- +layout: page +permalink: /external/contribute/review/ +shortcut: contribute:review +redirect_from: + - /cards/contribute:review + - /external/cards/contribute:review + - /contribute/review + - /external/external/contribute/review/ +--- + +# Reviewing in Git + +Before a branch can be merged to the *develop* branch, a review is often requested. If you have been desginated as the reviewer of a merge request, it means that your approval is needed to be able to proceed with the merge of the branch. + +To do the review, click on the link sent by GitLab. You will be redirected to GitLab and directly on the merge request. + +You can see the name of the merge request (*LCSB-SOP-ADM-001*), and the history of the merge request in *Overview*. + +- Click on **Changes** + +<div align="center"> +<img src="img/img1.png"> +</div> + +- On the left side is the list of the files impacted by this merge request. + +A red square next to a file means that the file has been removed. + +An orange one means that the file has been modified. + +A green one means that the file has been added. + +<div align="center"> +<img src="img/img2.png"> +</div> + +- Click on the **.md file** + + - *Red sections* have been deleted or modified + - *Green sections* are the modified version of the red sections or are newly added + + <div align="center"> + <img src="img/img3.png"> + </div> + + - If there was no change compared to the previously approved the section will not be highlited. If several lines have not been impacted, they might be collapsed. To uncollapse the lines, click on the arrows. + + <div align="center"> + <img src="img/img4.png"> + </div> + +To have a more readable view, with the pictures integrated, click on the 3 dots on the right side and click on *View files @ xxxxx*. + +<div align="center"> +<img src="img/img5.png"> +</div> + +- To make a comment on a line, place your mouse on the line number and click on the bubble that appears on the left side. + +<div align="center"> +<img src="img/img6.png"> +</div> + +- Make your comment on the comment section and click on **Start a review** or on **Add comment now**. Clicking on *"Start a review"* will allow you to compile several comments before an email is sent to the assignee when you will click on **Finish review**. Clicking on *"Add comment now"* will send an email to the assignee for every comment. + +<div align="center"> +<img src="img/img7.png"> +</div> + +<div align="center"> +<img src="img/img8.png"> +</div> + +When all the threads are resolved, you will be able to **Approve** the merge request and the repository maintenair can proceed with the merge.