Changes

Page history
Update OurProcess authored by Merlin's avatar Merlin
Show whitespace changes
Inline Side-by-side
OurProcess.md
View page @ a1da67ee
...@@ -23,7 +23,7 @@ Our Development Process ...@@ -23,7 +23,7 @@ Our Development Process
# Tracking Progress in gitlab # Tracking Progress in gitlab
--- ---
![gitlab issue board](img/0501gitlabIssueBoard.PNG) ![0501gitlabIssueBoard](uploads/24d09009c58007fa5befe49309f66b0c/0501gitlabIssueBoard.PNG)
Two kinds of "issues" Two kinds of "issues"
...@@ -45,7 +45,7 @@ Two kinds of "issues" ...@@ -45,7 +45,7 @@ Two kinds of "issues"
* Create a new branch from the issue * Create a new branch from the issue
--- ---
![Create Branch](img/0502newBranch.PNG) ![Creating a new branch](uploads/64f24a29c9bdaacc60ca461400c07e96/0502newBranch.PNG)
--- ---
* Fetch the repository (to get access to that new branch) * Fetch the repository (to get access to that new branch)
...@@ -58,13 +58,13 @@ Two kinds of "issues" ...@@ -58,13 +58,13 @@ Two kinds of "issues"
* When complete, go to the branch on gitlab and make a merge request * When complete, go to the branch on gitlab and make a merge request
--- ---
![Merge Request](img/0503mergeRequest.PNG) ![0503mergeRequest](uploads/fb8cbd36b552eafb4863d0659ab2435c/0503mergeRequest.PNG)
--- ---
* Fill in the details of a merge request and submit it * Fill in the details of a merge request and submit it
--- ---
![Merge Request Details](img/0504mergeRequestDetails.PNG) ![0504mergeRequestDetails](uploads/72b38541d3b392667a5e30adc253ffe5/0504mergeRequestDetails.PNG)
--- ---
* ONLY DR. WELLINGTON WILL REVIEW THE MERGE REQUEST!!! DO NOT APPROVE IT!!!! Feel free to let her know that it is there so that she approves it in a timely fashion * ONLY DR. WELLINGTON WILL REVIEW THE MERGE REQUEST!!! DO NOT APPROVE IT!!!! Feel free to let her know that it is there so that she approves it in a timely fashion
... ...
......