From eef5b043381848b6432264693e79f1e57cd9b02c Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:21:56 +0200 Subject: [PATCH 01/24] Change link from gitlab-ce -> gitlab-foss - Project 'gitlab-org/gitlab-ce' was moved to 'gitlab-org/gitlab-foss'. --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 1984932f9..b127e8978 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -19,7 +19,7 @@ One nice touch Bitnami has included is the login screen (accessed by typing alt+ .The Bitnami GitLab virtual machine login screen image::images/bitnami.png[The Bitnami GitLab virtual machine login screen] -For anything else, follow the guidance in the GitLab Community Edition readme, which can be found at https://gitlab.com/gitlab-org/gitlab-ce/tree/master[]. +For anything else, follow the guidance in the GitLab Community Edition readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. There you'll find assistance for installing GitLab using Chef recipes, a virtual machine on Digital Ocean, and RPM and DEB packages (which, as of this writing, are in beta). There's also ``unofficial'' guidance on getting GitLab running with non-standard operating systems and databases, a fully-manual installation script, and many other topics. From fd1366cf7b591ff8b1d3411083f4c737133b80b7 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:40:37 +0200 Subject: [PATCH 02/24] Update GitLab installation methods --- book/04-git-server/sections/gitlab.asc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index b127e8978..8b07a7b94 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -19,9 +19,16 @@ One nice touch Bitnami has included is the login screen (accessed by typing alt+ .The Bitnami GitLab virtual machine login screen image::images/bitnami.png[The Bitnami GitLab virtual machine login screen] -For anything else, follow the guidance in the GitLab Community Edition readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. -There you'll find assistance for installing GitLab using Chef recipes, a virtual machine on Digital Ocean, and RPM and DEB packages (which, as of this writing, are in beta). -There's also ``unofficial'' guidance on getting GitLab running with non-standard operating systems and databases, a fully-manual installation script, and many other topics. +For anything else, follow the guidance in the GitLab Community Edition (CE) readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. + +GitLab strongly recommends installing GitLab on your server via the official Omnibus GitLab package. + +The other installation options are: + +* GitLab Helm chart, for use with Kubernetes. +* Dockerized GitLab packages for use with Docker. +* From the source files. +* Cloud provider such as AWS, Google Cloud Platform, Azure, OpenShift and Digital Ocean. ==== Administration From 94267b2993f99d0359bedc8158c34aaf02cb84e9 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:42:10 +0200 Subject: [PATCH 03/24] Remove bitnami GitLab stuff --- book/04-git-server/sections/gitlab.asc | 8 -------- images/bitnami.png | Bin 3117 -> 0 bytes 2 files changed, 8 deletions(-) delete mode 100644 images/bitnami.png diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 8b07a7b94..f854f94cd 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -11,14 +11,6 @@ This is a bit more complex than the GitWeb option and likely requires more maint GitLab is a database-backed web application, so its installation is a bit more involved than some other Git servers. Fortunately, this process is very well-documented and supported. -There are a few methods you can pursue to install GitLab. -To get something up and running quickly, you can download a virtual machine image or a one-click installer from https://bitnami.com/stack/gitlab[], and tweak the configuration to match your particular environment.(((bitnami))) -One nice touch Bitnami has included is the login screen (accessed by typing alt+→); it tells you the IP address and default username and password for the installed GitLab. - -[[bitnami]] -.The Bitnami GitLab virtual machine login screen -image::images/bitnami.png[The Bitnami GitLab virtual machine login screen] - For anything else, follow the guidance in the GitLab Community Edition (CE) readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. GitLab strongly recommends installing GitLab on your server via the official Omnibus GitLab package. diff --git a/images/bitnami.png b/images/bitnami.png deleted file mode 100644 index 9852e72764a9a55a1867a82c0a89ee4132351756..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3117 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 HrQ81ju`=z# From f8cc0ad5c2984c3341afd9f918460eb7a1628eb9 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:42:48 +0200 Subject: [PATCH 04/24] Fix grammar --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index f854f94cd..4b3440bf0 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -2,7 +2,7 @@ (((serving repositories, GitLab)))(((GitLab))) GitWeb is pretty simplistic though. -If you're looking for a more modern, fully featured Git server, there are some several open source solutions out there that you can install instead. +If you're looking for a more modern, fully featured Git server, there are several open source solutions out there that you can install instead. As GitLab is one of the more popular ones, we'll cover installing and using it as an example. This is a bit more complex than the GitWeb option and likely requires more maintenance, but it is a much more fully featured option. From a3c6dcc6eff87aa7ffad537beb534ebe44f0f089 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:44:53 +0200 Subject: [PATCH 05/24] Simplify text --- book/04-git-server/sections/gitlab.asc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 4b3440bf0..e1482395b 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -2,9 +2,9 @@ (((serving repositories, GitLab)))(((GitLab))) GitWeb is pretty simplistic though. -If you're looking for a more modern, fully featured Git server, there are several open source solutions out there that you can install instead. -As GitLab is one of the more popular ones, we'll cover installing and using it as an example. -This is a bit more complex than the GitWeb option and likely requires more maintenance, but it is a much more fully featured option. +If you're looking for a modern, fully featured Git server, there are several open source solutions out there that you can install instead. +As GitLab is one of the popular ones, we'll cover installing and using it as an example. +This is harder than the GitWeb option and will require more maintenance, but it is a fully featured option. ==== Installation From d04997d7cbe7ffed9b9aa089360c42ef062c268c Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:45:37 +0200 Subject: [PATCH 06/24] Remove fluff words --- book/04-git-server/sections/gitlab.asc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index e1482395b..a02cbdf3b 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -8,8 +8,8 @@ This is harder than the GitWeb option and will require more maintenance, but it ==== Installation -GitLab is a database-backed web application, so its installation is a bit more involved than some other Git servers. -Fortunately, this process is very well-documented and supported. +GitLab is a database-backed web application, so its installation is more involved than some other Git servers. +Fortunately, this process is well-documented and supported. For anything else, follow the guidance in the GitLab Community Edition (CE) readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. From 704187ac4cae84a2d579def5d83d5e449a239589 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:46:15 +0200 Subject: [PATCH 07/24] Change an -> the --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index a02cbdf3b..9b0f4a068 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -25,7 +25,7 @@ The other installation options are: ==== Administration GitLab's administration interface is accessed over the web. -Simply point your browser to the hostname or IP address where GitLab is installed, and log in as an admin user. +Simply point your browser to the hostname or IP address where GitLab is installed, and log in as the admin user. The default username is `admin@local.host`, and the default password is `5iveL!fe` (which you will be prompted to change as soon as you enter it). Once logged in, click the ``Admin area'' icon in the menu at the top right. From ef862faa2bf8144300c35bd9ceb9a3e2903bf82f Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:47:11 +0200 Subject: [PATCH 08/24] Use active language --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 9b0f4a068..ac9015ec8 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -26,7 +26,7 @@ The other installation options are: GitLab's administration interface is accessed over the web. Simply point your browser to the hostname or IP address where GitLab is installed, and log in as the admin user. -The default username is `admin@local.host`, and the default password is `5iveL!fe` (which you will be prompted to change as soon as you enter it). +The default username is `admin@local.host`, and the default password is `5iveL!fe` (which you must change right away). Once logged in, click the ``Admin area'' icon in the menu at the top right. [[gitlab_menu]] From 994693229cfdaf21813996d7b49ebbeb2451a633 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:49:49 +0200 Subject: [PATCH 09/24] Use active voice --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index ac9015ec8..076a172f9 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -27,7 +27,7 @@ The other installation options are: GitLab's administration interface is accessed over the web. Simply point your browser to the hostname or IP address where GitLab is installed, and log in as the admin user. The default username is `admin@local.host`, and the default password is `5iveL!fe` (which you must change right away). -Once logged in, click the ``Admin area'' icon in the menu at the top right. +After you've logged in, click the ``Admin area'' icon in the menu at the top right. [[gitlab_menu]] .The ``Admin area'' item in the GitLab menu From 5e1f4158295488c81ddc2b1c9acea7da796a76ff Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:54:08 +0200 Subject: [PATCH 10/24] Simplify sentence --- book/04-git-server/sections/gitlab.asc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 076a172f9..0fbcc9c69 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -35,8 +35,8 @@ image::images/gitlab-menu.png[The ``Admin area'' item in the GitLab menu] ===== Users -Users in GitLab are accounts that correspond to people. -User accounts don't have a lot of complexity; mainly it's a collection of personal information attached to login data. +Everybody using your GitLab server must have an user account. +User accounts are quite simple, they mainly contain personal information attached to login data. Each user account comes with a *namespace*, which is a logical grouping of projects that belong to that user. If the user +jane+ had a project named +project+, that project's url would be `http://server/jane/project`. From 61239e80d0f91240eca60882b1a57c8e6e8c8431 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:54:36 +0200 Subject: [PATCH 11/24] Simplify sentence --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 0fbcc9c69..0c9ca5249 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -37,7 +37,7 @@ image::images/gitlab-menu.png[The ``Admin area'' item in the GitLab menu] Everybody using your GitLab server must have an user account. User accounts are quite simple, they mainly contain personal information attached to login data. -Each user account comes with a *namespace*, which is a logical grouping of projects that belong to that user. +Each user account has a *namespace*, which is a logical grouping of projects that belong to that user. If the user +jane+ had a project named +project+, that project's url would be `http://server/jane/project`. [[gitlab_users]] From 765189d85f0904f66da0ef23afbf03297b6ce373 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:55:26 +0200 Subject: [PATCH 12/24] Use active voice --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 0c9ca5249..694061d78 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -44,7 +44,7 @@ If the user +jane+ had a project named +project+, that project's url would be `h .The GitLab user administration screen image::images/gitlab-users.png[The GitLab user administration screen] -Removing a user can be done in two ways. +You can remove a user account in two ways: ``Blocking'' a user prevents them from logging into the GitLab instance, but all of the data under that user's namespace will be preserved, and commits signed with that user's email address will still link back to their profile. ``Destroying'' a user, on the other hand, completely removes them from the database and filesystem. From a51424fa13f4610518ecb6d310a52370acd034b8 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:56:41 +0200 Subject: [PATCH 13/24] Use active voice --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 694061d78..2fda70d4e 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -49,7 +49,7 @@ You can remove a user account in two ways: ``Destroying'' a user, on the other hand, completely removes them from the database and filesystem. All projects and data in their namespace is removed, and any groups they own will also be removed. -This is obviously a much more permanent and destructive action, and its uses are rare. +This is obviously a much more permanent and destructive action, and you will rarely need it. [[_gitlab_groups_section]] ===== Groups From 9f80ac7cf2171f03926126406ec605913d212502 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:58:32 +0200 Subject: [PATCH 14/24] Replace assemblage -> collection --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 2fda70d4e..305385065 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -54,7 +54,7 @@ This is obviously a much more permanent and destructive action, and you will rar [[_gitlab_groups_section]] ===== Groups -A GitLab group is an assemblage of projects, along with data about how users can access those projects. +A GitLab group is a collection of projects, along with data about how users can access those projects. Each group has a project namespace (the same way that users do), so if the group +training+ has a project +materials+, its url would be `http://server/training/materials`. [[gitlab_groups]] From 0c6a979f47c2b3491b0833335b51dfd8cb4d5e0f Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:05:52 +0200 Subject: [PATCH 15/24] Remove also words --- book/04-git-server/sections/gitlab.asc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 305385065..0499dcf3a 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -69,9 +69,9 @@ The types of permissions are too numerous to list here, but GitLab has a helpful A GitLab project roughly corresponds to a single Git repository. Every project belongs to a single namespace, either a user or a group. -If the project belongs to a user, the owner of the project has direct control over who has access to the project; if the project belongs to a group, the group's user-level permissions will also take effect. +If the project belongs to a user, the owner of the project has direct control over who has access to the project; if the project belongs to a group, the group's user-level permissions will take effect. -Every project also has a visibility level, which controls who has read access to that project's pages and repository. +Every project has a visibility level, which controls who has read access to that project's pages and repository. If a project is _Private_, the project's owner must explicitly grant access to specific users. An _Internal_ project is visible to any logged-in user, and a _Public_ project is visible to anyone. Note that this controls both `git fetch` access as well as access to the web UI for that project. From d58de019093d8c873f4f5d8b3ca8ec349b1ef792 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:08:04 +0200 Subject: [PATCH 16/24] Use active voice --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 0499dcf3a..7da54e3f1 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -85,7 +85,7 @@ This is a great way to connect your Git repositories and GitLab instance to the ==== Basic Usage The first thing you'll want to do with GitLab is create a new project. -This is accomplished by clicking the ``+'' icon on the toolbar. +You can do this by clicking on the ``+'' icon on the toolbar. You'll be asked for the project's name, which namespace it should belong to, and what its visibility level should be. Most of what you specify here isn't permanent, and can be re-adjusted later through the settings interface. Click ``Create Project'', and you're done. From 7a7cc8acfe86652aba64ad54dbb9c90936d16896 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:09:00 +0200 Subject: [PATCH 17/24] Replace re-adjusted -> changed --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 7da54e3f1..a6d4187a6 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -87,7 +87,7 @@ This is a great way to connect your Git repositories and GitLab instance to the The first thing you'll want to do with GitLab is create a new project. You can do this by clicking on the ``+'' icon on the toolbar. You'll be asked for the project's name, which namespace it should belong to, and what its visibility level should be. -Most of what you specify here isn't permanent, and can be re-adjusted later through the settings interface. +Most of what you specify here isn't permanent, and can be changed later through the settings interface. Click ``Create Project'', and you're done. Once the project exists, you'll probably want to connect it with a local Git repository. From a96aa23c6ec89d7f7605803ce63516342a846393 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:11:47 +0200 Subject: [PATCH 18/24] Replace another -> each --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index a6d4187a6..039abca12 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -112,7 +112,7 @@ Each project's home page shows recent activity, and links along the top will lea ==== Working Together -The simplest way of working together on a GitLab project is by giving another user direct push access to the Git repository. +The simplest way of working together on a GitLab project is by giving each user direct push access to the Git repository. You can add a user to a project by going to the ``Members'' section of that project's settings, and associating the new user with an access level (the different access levels are discussed a bit in <<_gitlab_groups_section>>). By giving a user an access level of ``Developer'' or above, that user can push commits and branches directly to the repository with impunity. From d031becc9057e62ef8ca0f9c378cd768e44bf995 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:12:33 +0200 Subject: [PATCH 19/24] Remove unncessary words --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 039abca12..9b9239943 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -114,7 +114,7 @@ Each project's home page shows recent activity, and links along the top will lea The simplest way of working together on a GitLab project is by giving each user direct push access to the Git repository. You can add a user to a project by going to the ``Members'' section of that project's settings, and associating the new user with an access level (the different access levels are discussed a bit in <<_gitlab_groups_section>>). -By giving a user an access level of ``Developer'' or above, that user can push commits and branches directly to the repository with impunity. +By giving a user an access level of ``Developer'' or above, that user can push commits and branches directly to the repository. Another, more decoupled way of collaboration is by using merge requests. This feature enables any user that can see a project to contribute to it in a controlled way. From 32cfd2705c5db00c6d22fce3c1ce288fee57721f Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:13:31 +0200 Subject: [PATCH 20/24] Clarify whose fork/copy it is in the text --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 9b9239943..179326bb5 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -119,7 +119,7 @@ By giving a user an access level of ``Developer'' or above, that user can push c Another, more decoupled way of collaboration is by using merge requests. This feature enables any user that can see a project to contribute to it in a controlled way. Users with direct access can simply create a branch, push commits to it, and open a merge request from their branch back into `master` or any other branch. -Users who don't have push permissions for a repository can ``fork'' it (create their own copy), push commits to _that_ copy, and open a merge request from their fork back to the main project. +Users who don't have push permissions for a repository can ``fork'' it to create their own copy, push commits to _their_ copy, and open a merge request from their fork back to the main project. This model allows the owner to be in full control of what goes into the repository and when, while allowing contributions from untrusted users. Merge requests and issues are the main units of long-lived discussion in GitLab. From d8958d22c1260e25d4ac57bafcff9f5ffbb82cb6 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:19:15 +0200 Subject: [PATCH 21/24] Replace accomplished -> done --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 179326bb5..48ddc8322 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -127,4 +127,4 @@ Each merge request allows a line-by-line discussion of the proposed change (whic Both can be assigned to users, or organized into milestones. This section is focused mainly on the Git-related features of GitLab, but as a mature project, it provides many other features to help your team work together, such as project wikis and system maintenance tools. -One benefit to GitLab is that, once the server is set up and running, you'll rarely need to tweak a configuration file or access the server via SSH; most administration and general usage can be accomplished through the in-browser interface. +One benefit to GitLab is that, once the server is set up and running, you'll rarely need to tweak a configuration file or access the server via SSH; most administration and general usage can be done through the in-browser interface. From d4c73a2241b40c15b3e71a3ba3a20b535664df5a Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 21:51:10 +0200 Subject: [PATCH 22/24] Fix sentence --- book/04-git-server/sections/gitlab.asc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 48ddc8322..17d030f28 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -10,8 +10,7 @@ This is harder than the GitWeb option and will require more maintenance, but it GitLab is a database-backed web application, so its installation is more involved than some other Git servers. Fortunately, this process is well-documented and supported. - -For anything else, follow the guidance in the GitLab Community Edition (CE) readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. +For more information read the GitLab Community Edition (CE) readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. GitLab strongly recommends installing GitLab on your server via the official Omnibus GitLab package. From d926d592bb58d7cfefe7b0f56be365d66592e007 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 28 Aug 2020 21:55:28 +0200 Subject: [PATCH 23/24] Move sentence to more logical place --- book/04-git-server/sections/gitlab.asc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 17d030f28..be32569a0 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -10,8 +10,6 @@ This is harder than the GitWeb option and will require more maintenance, but it GitLab is a database-backed web application, so its installation is more involved than some other Git servers. Fortunately, this process is well-documented and supported. -For more information read the GitLab Community Edition (CE) readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. - GitLab strongly recommends installing GitLab on your server via the official Omnibus GitLab package. The other installation options are: @@ -21,6 +19,8 @@ The other installation options are: * From the source files. * Cloud provider such as AWS, Google Cloud Platform, Azure, OpenShift and Digital Ocean. +For more information read the GitLab Community Edition (CE) readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. + ==== Administration GitLab's administration interface is accessed over the web. From e3ad770bd60f20909c73a76fb25e81a97693edf4 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Sat, 29 Aug 2020 12:21:04 +0200 Subject: [PATCH 24/24] Make link prettier --- book/04-git-server/sections/gitlab.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index be32569a0..b88024cb7 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -19,7 +19,7 @@ The other installation options are: * From the source files. * Cloud provider such as AWS, Google Cloud Platform, Azure, OpenShift and Digital Ocean. -For more information read the GitLab Community Edition (CE) readme, which can be found at https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[]. +For more information read the https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/README.md[GitLab Community Edition (CE) readme]. ==== Administration