diff --git a/docs/tools/gitlab.md b/docs/gitlab.md similarity index 57% rename from docs/tools/gitlab.md rename to docs/gitlab.md index 7e1cf27f9430b3288430c49d5c4f6c7d0a52ccd3..e84d21fab45645830e7f24339beef475307daa23 100644 --- a/docs/tools/gitlab.md +++ b/docs/gitlab.md @@ -1,9 +1,8 @@ --- layout: default title: Git and GitLab -parent: Open WIN Tools has_children: true -nav_order: 5 +nav_order: 7 --- @@ -38,39 +37,3 @@ Git and GitLab are an excellent resource for inviting others to contribute to yo #### GitLab pages GitLab pages allows you to build professional looking websites, like this one! It is relatively straightforward to build a simple website to share your work with the world, and the options for building in additional complexity are endless. - - -## How to use -Follow the below tutorials (left in the navigation panel) to set up and use GitLab for hosting, communicating and managing your version controlled projects - -### 1. Tools for git and GitLab -- [1.1 Using the command line](1-1-tools-command-line) -- [1.2 Writing in markdown](1-2-tools-markdown) -- [1.3 Atom text editor](1-3-tools-atom) - -### 2. Getting started -- [2.1 Your GitLab account](2-1-starting-gitlab-account) -- [2.2 Global git configuration](2-2-starting-configure-git) -- [2.3 Your local repository](2-3-starting-local-repo) -- [2.4 Basic git commands](2-4-starting-git-basics) - -### 3. Collaborating on GitLab -- [3.1 Collaborating on GitLab](3-1-collaborating-stranger-or-collaborator) -- [3.2 Collaborating with a stranger](3-2-collaborating-fork-their-repo) -- [3.3 Play with this page](3-3-collaborating-play-with-this-page) - -### 4. Making and publishing your repository -- [4.1 Make a repository](4-1-you-make-your-repo) -- [4.2 Create a doi](4-2-you-doi) -- [4.3 Making your pages site](4-3-you-make-your-pages-site) - -### 5. Managing your project on GitLab -- [5.1 GitLab issues](5-1-projectmanagement-issues) -- [5.2 GitLab milestones](5-2-projectmanagement-milestones) - -## Who should I ask for further advice about using GitLab -The Open WIN community are a great resource for support in using GitLab. [Join the community](https://open.win.ox.ac.uk/pages/open-science/community/Open-WIN-Community/docs/contact/) and try asking your question on slack! - -You are very welcome to as the [Open WIN Engagement Coordinator](https://open.win.ox.ac.uk/pages/open-science/community/Open-WIN-Community/docs/community/community-who/#community-coordinator---cassandra-gould-van-praag-sheher) for specific advice on using GitLab. - -Technical issues on the GitLab instance should be directed to [WIN IT](https://sharepoint.nexus.ox.ac.uk/sites/NDCN/FMRIB/IT/Pages/default.aspx). diff --git a/docs/tools/gitlab/1-1-tools-command-line.md b/docs/gitlab/1-1-tools-command-line.md similarity index 98% rename from docs/tools/gitlab/1-1-tools-command-line.md rename to docs/gitlab/1-1-tools-command-line.md index 5b324d992bd927bb11afdefda274350e1ca7783f..abbdfa72bf44bd7f178d4300c3491867fc21d48e 100644 --- a/docs/tools/gitlab/1-1-tools-command-line.md +++ b/docs/gitlab/1-1-tools-command-line.md @@ -1,8 +1,8 @@ --- layout: default title: 1.1 Using the command line -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 1 --- diff --git a/docs/tools/gitlab/1-2-tools-markdown.md b/docs/gitlab/1-2-tools-markdown.md similarity index 96% rename from docs/tools/gitlab/1-2-tools-markdown.md rename to docs/gitlab/1-2-tools-markdown.md index d660e3105ca55866e883270d5cefd19b6a3db343..f71f97c47f97e8500b09d79734fc6bf800721dd4 100644 --- a/docs/tools/gitlab/1-2-tools-markdown.md +++ b/docs/gitlab/1-2-tools-markdown.md @@ -1,8 +1,8 @@ --- layout: default title: 1.2 Writing in markdown -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 2 --- diff --git a/docs/tools/gitlab/1-3-tools-atom.md b/docs/gitlab/1-3-tools-atom.md similarity index 97% rename from docs/tools/gitlab/1-3-tools-atom.md rename to docs/gitlab/1-3-tools-atom.md index 34701e3f940ced0cd0004e94ee339983f2a178ba..8a4c0bd38a36c8bfd0304dcf3c64918bd6a1653d 100644 --- a/docs/tools/gitlab/1-3-tools-atom.md +++ b/docs/gitlab/1-3-tools-atom.md @@ -1,8 +1,8 @@ --- layout: default title: 1.3 Atom text editor -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 3 --- diff --git a/docs/tools/gitlab/2-1-starting-gitlab-account.md b/docs/gitlab/2-1-starting-gitlab-account.md similarity index 96% rename from docs/tools/gitlab/2-1-starting-gitlab-account.md rename to docs/gitlab/2-1-starting-gitlab-account.md index 1a3cadffeaa3b4670e6c1a756629198174a1aeaa..e302218c674c04e37588a9d3dd3fed96d47f4198 100644 --- a/docs/tools/gitlab/2-1-starting-gitlab-account.md +++ b/docs/gitlab/2-1-starting-gitlab-account.md @@ -1,8 +1,8 @@ --- layout: default title: 2.1 Your GitLab account -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 4 --- diff --git a/docs/tools/gitlab/2-2-starting-configure-git.md b/docs/gitlab/2-2-starting-configure-git.md similarity index 95% rename from docs/tools/gitlab/2-2-starting-configure-git.md rename to docs/gitlab/2-2-starting-configure-git.md index 15111941caecfcd1293b0198fe8d00fff1b2c16c..cffe101de7fd5b78789fc73eaa93c4f0f5f93f4e 100644 --- a/docs/tools/gitlab/2-2-starting-configure-git.md +++ b/docs/gitlab/2-2-starting-configure-git.md @@ -1,8 +1,8 @@ --- layout: default title: 2.2 Global git configuration -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 5 --- diff --git a/docs/tools/gitlab/2-3-starting-local-repo.md b/docs/gitlab/2-3-starting-local-repo.md similarity index 98% rename from docs/tools/gitlab/2-3-starting-local-repo.md rename to docs/gitlab/2-3-starting-local-repo.md index 5fb49edf9b947ef40742c8e66fbe78967ccad49f..cd937ed9182e750fe75d57bd8089c7b8bdd4e02f 100644 --- a/docs/tools/gitlab/2-3-starting-local-repo.md +++ b/docs/gitlab/2-3-starting-local-repo.md @@ -1,8 +1,8 @@ --- layout: default title: 2.3 Your local repository -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 6 --- diff --git a/docs/tools/gitlab/2-4-starting-git-basics.md b/docs/gitlab/2-4-starting-git-basics.md similarity index 98% rename from docs/tools/gitlab/2-4-starting-git-basics.md rename to docs/gitlab/2-4-starting-git-basics.md index 912114109c5931496c96339da60e9fe0ac353646..0260299854f7d7d3c6ee0094659dd7d2d4b930fe 100644 --- a/docs/tools/gitlab/2-4-starting-git-basics.md +++ b/docs/gitlab/2-4-starting-git-basics.md @@ -1,8 +1,8 @@ --- layout: default title: 2.4 Basic git commands -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 7 --- diff --git a/docs/tools/gitlab/3-1-collaborating-stranger-or-collaborator.md b/docs/gitlab/3-1-collaborating-stranger-or-collaborator.md similarity index 96% rename from docs/tools/gitlab/3-1-collaborating-stranger-or-collaborator.md rename to docs/gitlab/3-1-collaborating-stranger-or-collaborator.md index b946c141e8290175426f448a5f16d0ce227eec35..9c14ee5afc6d56bc3d79ae57f7512814fa5f49f8 100644 --- a/docs/tools/gitlab/3-1-collaborating-stranger-or-collaborator.md +++ b/docs/gitlab/3-1-collaborating-stranger-or-collaborator.md @@ -1,8 +1,8 @@ --- layout: default title: 3.1 Collaborating on GitLab -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 8 --- diff --git a/docs/tools/gitlab/3-2-collaborating-fork-their-repo.md b/docs/gitlab/3-2-collaborating-fork-their-repo.md similarity index 98% rename from docs/tools/gitlab/3-2-collaborating-fork-their-repo.md rename to docs/gitlab/3-2-collaborating-fork-their-repo.md index b6d699dae197d9d20140783ac41c65ef3839f350..4f3a1ae9ad83d05a6b179ca410044771eb1f913b 100644 --- a/docs/tools/gitlab/3-2-collaborating-fork-their-repo.md +++ b/docs/gitlab/3-2-collaborating-fork-their-repo.md @@ -1,8 +1,8 @@ --- layout: default title: 3.2 Collaborating with a stranger -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 9 --- diff --git a/docs/tools/gitlab/3-3-collaborating-play-with-this-page.md b/docs/gitlab/3-3-collaborating-play-with-this-page.md similarity index 98% rename from docs/tools/gitlab/3-3-collaborating-play-with-this-page.md rename to docs/gitlab/3-3-collaborating-play-with-this-page.md index 6be72c609b9226b5b92d54f16b7577b3233c8e56..14febb111c655fcf9c749e85a1c84fb684329470 100644 --- a/docs/tools/gitlab/3-3-collaborating-play-with-this-page.md +++ b/docs/gitlab/3-3-collaborating-play-with-this-page.md @@ -1,8 +1,8 @@ --- layout: default title: 3.3 Play with this page -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 10 --- diff --git a/docs/tools/gitlab/4-1-you-make-your-repo.md b/docs/gitlab/4-1-you-make-your-repo.md similarity index 98% rename from docs/tools/gitlab/4-1-you-make-your-repo.md rename to docs/gitlab/4-1-you-make-your-repo.md index ecf9197f1c912867e41d79b7fb6e5f520226816a..88da863226b567da5a52ef862f6f9cffc12a21df 100644 --- a/docs/tools/gitlab/4-1-you-make-your-repo.md +++ b/docs/gitlab/4-1-you-make-your-repo.md @@ -1,8 +1,8 @@ --- layout: default title: 4.1 Make a repository -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 11 --- diff --git a/docs/tools/gitlab/4-2-you-doi.md b/docs/gitlab/4-2-you-doi.md similarity index 98% rename from docs/tools/gitlab/4-2-you-doi.md rename to docs/gitlab/4-2-you-doi.md index c05f7d4469ad1956bde61f7a2dcd6569b5afbfa4..d2fbfd487933824f660567675e87130bae29f137 100644 --- a/docs/tools/gitlab/4-2-you-doi.md +++ b/docs/gitlab/4-2-you-doi.md @@ -1,8 +1,8 @@ --- layout: default title: 4.2 Create a doi -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 12 --- diff --git a/docs/tools/gitlab/4-3-you-make-your-pages-site.md b/docs/gitlab/4-3-you-make-your-pages-site.md similarity index 99% rename from docs/tools/gitlab/4-3-you-make-your-pages-site.md rename to docs/gitlab/4-3-you-make-your-pages-site.md index 1e39c415b0128ffbcb0dc8771e2af5dc6be78a70..69c0fa25df0490e38faa58fb4425fe1fdaf7f266 100644 --- a/docs/tools/gitlab/4-3-you-make-your-pages-site.md +++ b/docs/gitlab/4-3-you-make-your-pages-site.md @@ -1,8 +1,8 @@ --- layout: default title: 4.3 Making your pages site -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 13 --- diff --git a/docs/tools/gitlab/5-1-projectmanagement-issues.md b/docs/gitlab/5-1-projectmanagement-issues.md similarity index 82% rename from docs/tools/gitlab/5-1-projectmanagement-issues.md rename to docs/gitlab/5-1-projectmanagement-issues.md index 09f42c91f9ce45adf3d6d988c0aead1748c9237d..4cf2eb9112c1a7eab7ced42d32aaf452e099974c 100644 --- a/docs/tools/gitlab/5-1-projectmanagement-issues.md +++ b/docs/gitlab/5-1-projectmanagement-issues.md @@ -1,8 +1,8 @@ --- layout: default title: 5.1 GitLab issues -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 14 --- diff --git a/docs/tools/gitlab/5-2-projectmanagement-milestones.md b/docs/gitlab/5-2-projectmanagement-milestones.md similarity index 82% rename from docs/tools/gitlab/5-2-projectmanagement-milestones.md rename to docs/gitlab/5-2-projectmanagement-milestones.md index cec42c34ed59951e9a089446a272c149dae2fe2c..bf012552d2feb016074b937657579aa17b01fd8f 100644 --- a/docs/tools/gitlab/5-2-projectmanagement-milestones.md +++ b/docs/gitlab/5-2-projectmanagement-milestones.md @@ -1,8 +1,8 @@ --- layout: default title: 5.2 GitLab milestones -parent: Git and GitLab -grand_parent: Open WIN Tools +parent: Tutorials +grand_parent: Git and GitLab has_children: false nav_order: 15 --- diff --git a/docs/gitlab/gitlab-tutorials.md b/docs/gitlab/gitlab-tutorials.md new file mode 100644 index 0000000000000000000000000000000000000000..22932d912f3d7fb00a41f5a654c9317c970c600c --- /dev/null +++ b/docs/gitlab/gitlab-tutorials.md @@ -0,0 +1,51 @@ +--- +layout: default +title: Tutorials +parent: Git and GitLab +has_children: false +nav_order: 1 +--- + + +# Get to grips with GitLab +{: .fs-8 } + +Follow this series of tutorials to start working with GitLab +{: .fs-6 .fw-300 } + +--- + +## How to use +Follow the below tutorials (left in the navigation panel) to set up and use GitLab for hosting, communicating, collaborating on and managing your version controlled projects. + +### 1. Tools for git and GitLab +- [1.1 Using the command line](1-1-tools-command-line) +- [1.2 Writing in markdown](1-2-tools-markdown) +- [1.3 Atom text editor](1-3-tools-atom) + +### 2. Getting started +- [2.1 Your GitLab account](2-1-starting-gitlab-account) +- [2.2 Global git configuration](2-2-starting-configure-git) +- [2.3 Your local repository](2-3-starting-local-repo) +- [2.4 Basic git commands](2-4-starting-git-basics) + +### 3. Collaborating on GitLab +- [3.1 Collaborating on GitLab](3-1-collaborating-stranger-or-collaborator) +- [3.2 Collaborating with a stranger](3-2-collaborating-fork-their-repo) +- [3.3 Play with this page](3-3-collaborating-play-with-this-page) + +### 4. Making and publishing your repository +- [4.1 Make a repository](4-1-you-make-your-repo) +- [4.2 Create a doi](4-2-you-doi) +- [4.3 Making your pages site](4-3-you-make-your-pages-site) + +### 5. Managing your project on GitLab +- [5.1 GitLab issues](5-1-projectmanagement-issues) +- [5.2 GitLab milestones](5-2-projectmanagement-milestones) + +## Who should I ask for further advice about using GitLab +The Open WIN community are a great resource for support in using GitLab. [Join the community](https://open.win.ox.ac.uk/pages/open-science/community/Open-WIN-Community/docs/contact/) and try asking your question on slack! + +You are very welcome to ask the [Open WIN Engagement Coordinator](https://open.win.ox.ac.uk/pages/open-science/community/Open-WIN-Community/docs/community/community-who/#community-coordinator---cassandra-gould-van-praag-sheher) for specific advice on using GitLab. + +Technical issues on the GitLab instance should be directed to [WIN IT](https://sharepoint.nexus.ox.ac.uk/sites/NDCN/FMRIB/IT/Pages/default.aspx).