summaryrefslogtreecommitdiffstats
path: root/src/site
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-08 11:27:00 -0500
committerJames Moger <james.moger@gitblit.com>2014-03-08 11:27:00 -0500
commitc134a0c3f2440a09c5b8c8c6837c95aba3d4f84f (patch)
treeff373e9298876767b763890f345c10a02eef43a8 /src/site
parentd8b4e317f116a6da616f8842ebf07f292e77de3f (diff)
downloadgitblit-c134a0c3f2440a09c5b8c8c6837c95aba3d4f84f.tar.gz
gitblit-c134a0c3f2440a09c5b8c8c6837c95aba3d4f84f.zip
Move Gitblit branches to refs/meta/gitblit
Diffstat (limited to 'src/site')
-rw-r--r--src/site/tickets_replication.mkd12
-rw-r--r--src/site/tickets_setup.mkd2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/site/tickets_replication.mkd b/src/site/tickets_replication.mkd
index 542fd5fc..472c7270 100644
--- a/src/site/tickets_replication.mkd
+++ b/src/site/tickets_replication.mkd
@@ -23,7 +23,7 @@ After you've done this, you will need to reset Gitblit's internal ticket cache a
#### Ticket Replication
Gitblit supports ticket replication for a couple of scenarios with the *BranchTicketService*. This requires that the Gitblit instance receiving the ticket data be configured for the *BranchTicketService*. Likewise, the source of the ticket data must be a repository that has ticket data persisted using the *BranchTicketService*.
-##### Manually Pushing refs/gitblit/tickets
+##### Manually Pushing refs/meta/gitblit/tickets
Let's say you wanted to create a perfect clone of the Gitblit repository hosted at https://dev.gitblit.com in your own Gitblit instance. We'll use this repository as an example because it is configured for the *BranchTicketService*.
@@ -41,7 +41,7 @@ Let's say you wanted to create a perfect clone of the Gitblit repository hosted
If your push was successful you should have a new repository with the entire official Gitblit tickets data.
-##### Mirroring refs/gitblit/tickets
+##### Mirroring refs/meta/gitblit/tickets
Gitblit 1.4.0 introduces a mirroring service. This is not the same as the federation feature - although there are similarities.
@@ -55,16 +55,16 @@ If you setup a mirror of another Gitblit repository which uses the *BranchTicket
4. After you have indexed the repository, Gitblit will take over and incrementally update your tickets data on each fetch.
#### Advanced Administration
-Repository owners or Gitblit administrators have the option of manually editing ticket data. To do this you must fetch and checkout the `refs/gitblit/tickets` ref. This orphan branch is where ticket data is stored. You may then use a text editor to **carefully** manipulate journals and push your changes back upstream. I recommend using a JSON validation tool to ensure your changes are valid JSON.
+Repository owners or Gitblit administrators have the option of manually editing ticket data. To do this you must fetch and checkout the `refs/meta/gitblit/tickets` ref. This orphan branch is where ticket data is stored. You may then use a text editor to **carefully** manipulate journals and push your changes back upstream. I recommend using a JSON validation tool to ensure your changes are valid JSON.
- git fetch origin refs/gitblit/tickets
+ git fetch origin refs/meta/gitblit/tickets
git checkout -B tix FETCH_HEAD
...fix data...
git add .
git commit
- git push origin HEAD:refs/gitblit/tickets
+ git push origin HEAD:refs/meta/gitblit/tickets
-Gitblit will identify the incoming `refs/gitblit/tickets` ref update and will incrementally index the changed tickets OR, if the update is non-fast-forward, all tickets on that branch will be reindexed.
+Gitblit will identify the incoming `refs/meta/gitblit/tickets` ref update and will incrementally index the changed tickets OR, if the update is non-fast-forward, all tickets on that branch will be reindexed.
### RedisTicketService
diff --git a/src/site/tickets_setup.mkd b/src/site/tickets_setup.mkd
index ee27b44a..c098f4c1 100644
--- a/src/site/tickets_setup.mkd
+++ b/src/site/tickets_setup.mkd
@@ -20,7 +20,7 @@ Your ticket journals are persisted to `tickets/{shard}/{id}/journal.json`. Thes
tickets.service = com.gitblit.tickets.BranchTicketService
-Your ticket journals are persisted to `id/{shard}/{id}/journal.json`. These journals are stored on an orphan branch, `refs/gitblit/tickets`, within your repository. This allows you to easily clone your entire ticket history to client working copies or to mirrors.
+Your ticket journals are persisted to `id/{shard}/{id}/journal.json`. These journals are stored on an orphan branch, `refs/meta/gitblit/tickets`, within your repository. This allows you to easily clone your entire ticket history to client working copies or to mirrors.
#### Redis Ticket Service