Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Delegate closed ticket changes to the Edit Ticket page | James Moger | 2014-03-05 | 2 | -138/+160 |
| | |||||
* | Allow unregistered milestone selection on edit ticket page | James Moger | 2014-03-05 | 1 | -0/+7 |
| | |||||
* | Allow changing status from edit ticket page | James Moger | 2014-03-05 | 3 | -1/+27 |
| | |||||
* | New proposal notifications should include the patchset details | James Moger | 2014-03-05 | 1 | -47/+42 |
| | |||||
* | Allow integration (mergeTo) branch to be changed in edit ticket | James Moger | 2014-03-05 | 2 | -1/+34 |
| | |||||
* | Localize the ticket activity tab field name changes | James Moger | 2014-03-05 | 2 | -2/+13 |
| | |||||
* | Merge pull request #145 from yin8086/ChineseTrans | James Moger | 2014-03-05 | 1 | -1/+8 |
|\ | | | | | Fix Chinese translate strings | ||||
| * | Fix Chinese translate strings | Stardrad Yin | 2014-03-05 | 1 | -1/+8 |
| | | |||||
* | | Merge pull request #144 from ds5apn/master | James Moger | 2014-03-05 | 1 | -482/+629 |
|\ \ | |/ |/| | Update Korean Translation for Gitblit 1.4.0 | ||||
| * | Update Korean Translation for Gitblit 1.4.0 | Dongsu, KIM | 2014-03-05 | 1 | -482/+629 |
| | | |||||
* | | Restart the response on the empty page if the repository has no commits | James Moger | 2014-03-05 | 1 | -1/+2 |
| | | |||||
* | | Remove Dagger injector from the servlet context instead of nulling it | James Moger | 2014-03-05 | 1 | -1/+1 |
| | | |||||
* | | Externalize some additional strings | James Moger | 2014-03-05 | 4 | -9/+14 |
| | | |||||
* | | Prevent <nil> from being stored as a milestone | James Moger | 2014-03-05 | 1 | -1/+1 |
| | | |||||
* | | Implement user "disabled" flag as an alternative to deleting the account | James Moger | 2014-03-04 | 12 | -17/+137 |
| | | |||||
* | | Simplified propose instructions for an existing ticket | James Moger | 2014-03-04 | 1 | -2/+2 |
| | | |||||
* | | Process bugtraq configuration in markup document rendering | James Moger | 2014-03-04 | 8 | -17/+35 |
| | | |||||
* | | Documentation | James Moger | 2014-03-04 | 4 | -41/+55 |
| | | |||||
* | | Add Chinese translation for 1.4.0 | Stardrad Yin | 2014-03-04 | 1 | -2/+149 |
|/ | |||||
* | Documentation | James Moger | 2014-03-03 | 2 | -3/+4 |
| | |||||
* | Lower opacity for merge commit short messages in the log panel | James Moger | 2014-03-03 | 2 | -3/+12 |
| | |||||
* | Fix reflog parsing bug of null compare links on branch creation | James Moger | 2014-03-03 | 1 | -2/+0 |
| | |||||
* | Fix pt push regression due to eliminating --patchset argument | James Moger | 2014-03-03 | 1 | -10/+1 |
| | |||||
* | Ticket tracker with patchset contributions | James Moger | 2014-03-03 | 83 | -691/+16298 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A basic issue tracker styled as a hybrid of GitHub and BitBucket issues. You may attach commits to an existing ticket or you can push a single commit to create a *proposal* ticket. Tickets keep track of patchsets (one or more commits) and allow patchset rewriting (rebase, amend, squash) by detecing the non-fast-forward update and assigning a new patchset number to the new commits. Ticket tracker -------------- The ticket tracker stores tickets as an append-only journal of changes. The journals are deserialized and a ticket is built by applying the journal entries. Tickets are indexed using Apache Lucene and all queries and searches are executed against this Lucene index. There is one trade-off to this persistence design: user attributions are non-relational. What does that mean? Each journal entry stores the username of the author. If the username changes in the user service, the journal entry will not reflect that change because the values are hard-coded. Here are a few reasons/justifications for this design choice: 1. commit identifications (author, committer, tagger) are non-relational 2. maintains the KISS principle 3. your favorite text editor can still be your administration tool Persistence Choices ------------------- **FileTicketService**: stores journals on the filesystem **BranchTicketService**: stores journals on an orphan branch **RedisTicketService**: stores journals in a Redis key-value datastore It should be relatively straight-forward to develop other backends (MongoDB, etc) as long as the journal design is preserved. Pushing Commits --------------- Each push to a ticket is identified as a patchset revision. A patchset revision may add commits to the patchset (fast-forward) OR a patchset revision may rewrite history (rebase, squash, rebase+squash, or amend). Patchset authors should not be afraid to polish, revise, and rewrite their code before merging into the proposed branch. Gitblit will create one ref for each patchset. These refs are updated for fast-forward pushes or created for rewrites. They are formatted as `refs/tickets/{shard}/{id}/{patchset}`. The *shard* is the last two digits of the id. If the id < 10, prefix a 0. The *shard* is always two digits long. The shard's purpose is to ensure Gitblit doesn't exceed any filesystem directory limits for file creation. **Creating a Proposal Ticket** You may create a new change proposal ticket just by pushing a **single commit** to `refs/for/{branch}` where branch is the proposed integration branch OR `refs/for/new` or `refs/for/default` which both will use the default repository branch. git push origin HEAD:refs/for/new **Updating a Patchset** The safe way to update an existing patchset is to push to the patchset ref. git push origin HEAD:refs/heads/ticket/{id} This ensures you do not accidentally create a new patchset in the event that the patchset was updated after you last pulled. The not-so-safe way to update an existing patchset is to push using the magic ref. git push origin HEAD:refs/for/{id} This push ref will update an exisitng patchset OR create a new patchset if the update is non-fast-forward. **Rebasing, Squashing, Amending** Gitblit makes rebasing, squashing, and amending patchsets easy. Normally, pushing a non-fast-forward update would require rewind (RW+) repository permissions. Gitblit provides a magic ref which will allow ticket participants to rewrite a ticket patchset as long as the ticket is open. git push origin HEAD:refs/for/{id} Pushing changes to this ref allows the patchset authors to rebase, squash, or amend the patchset commits without requiring client-side use of the *--force* flag on push AND without requiring RW+ permission to the repository. Since each patchset is tracked with a ref it is easy to recover from accidental non-fast-forward updates. Features -------- - Ticket tracker with status changes and responsible assignments - Patchset revision scoring mechanism - Update/Rewrite patchset handling - Close-on-push detection - Server-side Merge button for simple merges - Comments with Markdown syntax support - Rich mail notifications - Voting - Mentions - Watch lists - Querying - Searches - Partial miletones support - Multiple backend options | ||||
* | Eliminate Gravatar profile linking and improve api | James Moger | 2014-03-03 | 9 | -120/+17 |
| | |||||
* | Reduce use of final to avoid Wicket serialization issues in reflogs | James Moger | 2014-03-03 | 2 | -16/+15 |
| | |||||
* | Fixed rounded timestamps of reflogs | James Moger | 2014-03-03 | 2 | -9/+2 |
| | |||||
* | Eliminate problematic HEAD links from the blob, blame, and tree pages | James Moger | 2014-03-03 | 6 | -13/+3 |
| | |||||
* | Fix layouts on edit pages to properly use Bootstrap rows and spans | James Moger | 2014-03-03 | 3 | -8/+25 |
| | |||||
* | CSS tweak | James Moger | 2014-03-03 | 4 | -4/+4 |
| | |||||
* | Fix compare page exception when a submodule changes (issue-375) | James Moger | 2014-03-03 | 1 | -0/+1 |
| | |||||
* | Add an ajax text link and an icon ajax link | James Moger | 2014-03-01 | 3 | -0/+98 |
| | |||||
* | Add the No Docs page if there are no root documents | James Moger | 2014-03-01 | 5 | -1/+78 |
| | |||||
* | Fix potential NPE in creating a date label | James Moger | 2014-03-01 | 1 | -2/+2 |
| | |||||
* | Bypass Wicket bug related to url coding of array-type parameters | James Moger | 2014-03-01 | 1 | -0/+75 |
| | |||||
* | Add flatten string array to StringUtils | James Moger | 2014-03-01 | 1 | -0/+12 |
| | |||||
* | Encode ampersand in url | James Moger | 2014-03-01 | 1 | -0/+2 |
| | |||||
* | Redirect to log page is the blobpage references a commit we can't find | James Moger | 2014-03-01 | 1 | -2/+1 |
| | |||||
* | Gracefully recover history page from failure to find specified commit | James Moger | 2014-03-01 | 1 | -33/+48 |
| | |||||
* | Launch bugtraq links in a new tab | James Moger | 2014-03-01 | 1 | -1/+1 |
| | |||||
* | Add simplified transformGFM method to MarkdownUtils | James Moger | 2014-03-01 | 1 | -0/+45 |
| | |||||
* | Improve getting changed paths in a commit range | James Moger | 2014-03-01 | 1 | -1/+31 |
| | |||||
* | Properly dispose RevWalk in getCommit | James Moger | 2014-03-01 | 1 | -2/+9 |
| | |||||
* | Add method to calculate the diffstat between two commits | James Moger | 2014-03-01 | 1 | -0/+32 |
| | |||||
* | Added join methods to array utils | James Moger | 2014-03-01 | 1 | -0/+17 |
| | |||||
* | Move push authorization from the ARF to the receive pack | James Moger | 2014-03-01 | 1 | -9/+2 |
| | |||||
* | Move GarbageCollector repository methods to the RepositoryManager | James Moger | 2014-02-28 | 4 | -26/+77 |
| | |||||
* | Do not log empty messages in the receive pack | James Moger | 2014-02-28 | 1 | -2/+6 |
| | |||||
* | Improve notification api by introducing the Mailing model | James Moger | 2014-02-28 | 8 | -232/+268 |
| | |||||
* | Fixes to add-indexed-branch scripts | James Moger | 2014-02-28 | 2 | -5/+5 |
| |