diff options
Diffstat (limited to 'templates/main/jams/info.html')
| -rw-r--r-- | templates/main/jams/info.html | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/templates/main/jams/info.html b/templates/main/jams/info.html index 63f1cea6..920256a6 100644 --- a/templates/main/jams/info.html +++ b/templates/main/jams/info.html @@ -17,16 +17,16 @@ Git good - Dropbox bad </p> <p> - All of our code jams happen on <a href="http://github.com/">GitHub</a>. If you don't have an + All of our code jams happen on <a href="http://gitlab.com/">GitLab</a>. If you don't have an account there, you'll need to create one before you can join one of our code jams. Teams are required to fork the repository we have set up for the current code jam, commit their code to their fork, and - then open a pull request with their project on the code jam repository. + then open a merge request with their project on the code jam repository. </p> <p> Once the challenge task has been announced, head to the link provided to reach the challenge repository. In order to work on the task, you will need to fork the repository - this will create a copy of the repository under your account, which you will be able to work on with your teammates. To do so, - log into GitHub and click on the "Fork" button on the repository page. Select your username from the + log into GitLab and click on the "Fork" button on the repository page. Select your username from the dialogue, and it will be forked to your account. </p> <figure> @@ -55,7 +55,7 @@ <p> We will use Git to clone the repository to the machine. Simply type <code>git clone <url></code> and Git will download a copy of the repository. The URL is the same one you use to get to the - repository page on GitHub. Use <code>cd project-name</code> to change directory to the repository. + repository page on GitLab. Use <code>cd project-name</code> to change directory to the repository. </p> <figure> <img src="{{ static_file('images/jams/jams_6.png') }}" class="uk-align-center uk-border-rounded" /> @@ -73,10 +73,10 @@ terminal, and type <code>git add hello.py</code> to add this file to our changeset. </p> <p> - Next up, we'll need to bundle up our changes into a commit, and push it to GitHub. To do that, we'll + Next up, we'll need to bundle up our changes into a commit, and push it to GitLab. To do that, we'll use <code>git commit -am "message"</code>. Make sure you use a descriptive message explaining why you made your changes and what they are, but try to keep it to a single line of text if you can. - Following this, we can use <code>git push origin master</code> to push our commit up to GitHub. + Following this, we can use <code>git push origin master</code> to push our commit up to GitLab. </p> <figure> <img src="{{ static_file('images/jams/jams_8.png') }}" class="uk-align-center uk-border-rounded" /> @@ -96,9 +96,9 @@ Oh boy. </p> <p> - Once you've pushed some code to the repository, you will notice a "Pull request" link. Click on - that to create a pull request, which will let us know that you're working on the task and help us - to keep track of things. Simply click on the "Create pull request" button on the next page, fill + Once you've pushed some code to the repository, you will notice a "Merge request" link. Click on + that to create a merge request, which will let us know that you're working on the task and help us + to keep track of things. Simply click on the "Create merge request" button on the next page, fill in the "Title" box with your team number - for example, "Team 1" - and click the big green button to finish. </p> @@ -109,8 +109,8 @@ <img src="{{ static_file('images/jams/jams_16.png') }}" class="uk-align-center uk-border-rounded" /> </figure> <p> - Now that your pull request has been created, keep working on your project! Code that you push to - GitHub will automatically be added to your pull request in real-time. As the code jam continues on, + Now that your merge request has been created, keep working on your project! Code that you push to + GitLab will automatically be added to your merge request in real-time. As the code jam continues on, you may find review comments waiting from us. These are just suggestions to help you improve as a programmer - free advice from us. Feel free to incorporate our suggestions into your project if you wish. |