From 9804b40af4257f1136660f8b9df1986a44b3a5c3 Mon Sep 17 00:00:00 2001 From: Joel Johnson Date: Mon, 22 Jun 2015 15:59:56 -0600 Subject: typo: site ticket documentation --- src/site/tickets_overview.mkd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/site/tickets_overview.mkd b/src/site/tickets_overview.mkd index 14e4ab99..10d0e18f 100644 --- a/src/site/tickets_overview.mkd +++ b/src/site/tickets_overview.mkd @@ -70,7 +70,7 @@ Gitblit has adopted Gerrit's three-repository workflow and *magic ref* design fo 1. The organizational unit of the Gitblit Tickets feature is the *ticket*. 2. A *ticket* can be used to report a bug, request an enhancement, ask a question, etc. A ticket can also be used to collaborate on a *patchset* that addresses the request. 3. A *patchset* is a series of commits from a merge base that exists in the target branch of your repository to the tip of the patchset. A patchset may only contain a single commit, or it may contain dozens. This is similar to the commits in a *Pull Request*. One important distinction here is that in Gitblit, each *Patchset* is developed on a separate branch and can be completely rewritten without losing the previous patchsets (this creates a new patchset). -4. A *ticket* monitors the development of *patchsets* by tracking *revisions* to *patchsets*. The ticket alslo monitors rewritten patchsets. Each *patchset* is developed on it's own Git branch. +4. A *ticket* monitors the development of *patchsets* by tracking *revisions* to *patchsets*. The ticket also monitors rewritten patchsets. Each *patchset* is developed on it's own Git branch. Tracking *patchsets* is similar in concept to Gerrit, but there is a critical difference. In Gerrit, *every* commit in the *patchset* has it's own ticket **AND** Git branch. In Gerrit, *patchsets* can be easily rewritten and for each rewritten commit, a new branch ref is created. This leads to an explosion in refs for the repository over time. In Gitblit, only the tip of the *patchset* gets a branch ref and this branch ref is updated, like a regular branch, unless a rewrite is detected. -- cgit v1.2.3 From a3e480e28aa25dbbe341b10cfeb3fb1cfa625d18 Mon Sep 17 00:00:00 2001 From: Joel Johnson Date: Mon, 22 Jun 2015 16:00:08 -0600 Subject: typo: instantiate log message --- src/main/java/com/gitblit/manager/UserManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/com/gitblit/manager/UserManager.java b/src/main/java/com/gitblit/manager/UserManager.java index 0d7ee9a5..e88ac93c 100644 --- a/src/main/java/com/gitblit/manager/UserManager.java +++ b/src/main/java/com/gitblit/manager/UserManager.java @@ -120,7 +120,7 @@ public class UserManager implements IUserManager { File realmFile = runtimeManager.getFileOrFolder(Keys.realm.userService, "${baseFolder}/users.conf"); service = createUserService(realmFile); } catch (InstantiationException | IllegalAccessException e) { - logger.error("failed to instanciate user service {}: {}", realm, e.getMessage()); + logger.error("failed to instantiate user service {}: {}", realm, e.getMessage()); } } setUserService(service); -- cgit v1.2.3