Commit 73c3b319 authored by Luke Johnston's avatar Luke Johnston
Browse files

switch to main instead of master. Close #38

parent f380b978
Pipeline #297604331 canceled with stages
......@@ -10,7 +10,7 @@ build:
- R -e "remotes::install_deps(dependencies = c('Depends', 'Imports'))"
- Rscript _build.R
only:
- master
- main
artifacts:
paths:
- public
......@@ -24,6 +24,6 @@ deploy:
script:
- npx netlify deploy --prod --dir public
only:
- master
- main
dependencies:
- build
......@@ -55,7 +55,7 @@ Smaller changes made as a Merge Request are easier to review and merge than
bigger changes. The more targeted and specific the changes are, the better.
3. As you make edits, commit your changes to that branch.
4. Push the edits on that branch to the course repository.
5. Submit a merge request of the branch into the master branch.
5. Submit a merge request of the branch into the main branch.
7. If you receive feedback on your pull request, make further commits to the
branch on your cloned local copy. These will automatically be added to your merge
request after you commit and push.
......
......@@ -6,4 +6,4 @@ Copyright (c) 2020 Luke W. Johnston
The course material is licensed under the
[Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/)
and the course code is licensed under a [MIT License](https://gitlab.com/rostools/r-cubed-intermediate/-/blob/master/LICENSE-MIT.md).
and the course code is licensed under a [MIT License](https://gitlab.com/rostools/r-cubed-intermediate/-/blob/main/LICENSE-MIT.md).
......@@ -2,7 +2,7 @@
# Reproducible Research in R: An intermediate workshop on modern approaches and workflows to processing data <img src="images/apple-touch-icon.png" align="right" height=100/>
[![Netlify Status](https://api.netlify.com/api/v1/badges/b744cd78-5e3c-4d19-924f-4c249a294e5a/deploy-status)](https://app.netlify.com/sites/r-cubed-intermediate-rostools/deploys)
[![pipeline status](https://gitlab.com/rostools/r-cubed-intermediate/badges/master/pipeline.svg)](https://gitlab.com/rostools/r-cubed-intermediate/-/commits/master)
[![pipeline status](https://gitlab.com/rostools/r-cubed-intermediate/badges/main/pipeline.svg)](https://gitlab.com/rostools/r-cubed-intermediate/-/commits/main)
[![License: CC BY 4.0](https://img.shields.io/badge/License-CC%20BY%204.0-lightgrey.svg)](https://creativecommons.org/licenses/by/4.0/)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4061900.svg)](https://doi.org/10.5281/zenodo.4061900)
......
......@@ -2,10 +2,10 @@ output_dir: "public"
book_filename: "r-cubed-intermediate"
delete_merged_file: true
view:
link: https://gitlab.com/rostools/r-cubed-intermediate/blob/master/%s
link: https://gitlab.com/rostools/r-cubed-intermediate/blob/main/%s
text: View
edit:
link: https://gitlab.com/rostools/r-cubed-intermediate/edit/master/%s
link: https://gitlab.com/rostools/r-cubed-intermediate/edit/main/%s
text: Edit
language:
ui:
......
......@@ -75,8 +75,8 @@ comments directly on this website.
to make comments and give feedback for the material.
[hypothes.is]: https://web.hypothes.is/
[README]: https://gitlab.com/rostools/r-cubed-intermediate/-/blob/master/README.md
[CONTRIBUTING]: https://gitlab.com/rostools/r-cubed-intermediate/-/blob/master/CONTRIBUTING.md
[README]: https://gitlab.com/rostools/r-cubed-intermediate/-/blob/main/README.md
[CONTRIBUTING]: https://gitlab.com/rostools/r-cubed-intermediate/-/blob/main/CONTRIBUTING.md
## Re-use and licensing {#licensing}
......@@ -84,7 +84,7 @@ to make comments and give feedback for the material.
The course material is licensed under the
[Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/)
and the course code is licensed under a [MIT License](https://gitlab.com/rostools/r-cubed-intermediate/-/blob/master/LICENSE-MIT.md),
and the course code is licensed under a [MIT License](https://gitlab.com/rostools/r-cubed-intermediate/-/blob/main/LICENSE-MIT.md),
so the material can be used, re-used, and modified,
as long as there is attribution to this source.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment