From eb49a132143fa2efdf7e173968a582ecb4476b6e Mon Sep 17 00:00:00 2001 From: Haruo Nakayama Date: Mon, 17 Nov 2014 16:53:52 +0900 Subject: [PATCH 1/2] Remove a deprecated feature of GitLab --- 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 085a172c7..8ad600d3f 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -128,5 +128,5 @@ 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 has focused mainly on the Git-related parts of GitLab, but it's a fairly mature system, and provides many other features that can help your team work together. -These include project wikis, discussion ``walls'', and system maintenance tools. +These include 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. From eb022d6201dfeb445ef8fd1440be4d61832fe816 Mon Sep 17 00:00:00 2001 From: Haruo Nakayama Date: Fri, 28 Nov 2014 09:19:50 +0900 Subject: [PATCH 2/2] Tweak the sentence ref https://github.com/progit/progit2/pull/179#issuecomment-64820938 --- 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 8ad600d3f..f04943dcf 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -127,6 +127,5 @@ Merge requests and issues are the main units of long-lived discussion in GitLab. Each merge request allows a line-by-line discussion of the proposed change (which supports a lightweight kind of code review), as well as a general overall discussion thread. Both can be assigned to users, or organized into milestones. -This section has focused mainly on the Git-related parts of GitLab, but it's a fairly mature system, and provides many other features that can help your team work together. -These include project wikis and system maintenance tools. +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.