summaryrefslogtreecommitdiffstats
path: root/gitblit.iml
Commit message (Collapse)AuthorAgeFilesLines
* Bump SSHD version to 0.10.1David Ostrovsky2014-04-101-6/+6
| | | | Change-Id: Ic7e204fb7ee2eb172f4c8424fc3d4b7e6c631ddd
* Support serving repositories over the SSH transportEric Myhre2014-04-101-0/+22
| | | | | | | Gitblit would greatly benefit from an integrated SSH server. This would complete the transport trifecta. Change-Id: I6fb95abe65655fa74d47ea71522d8d9a1541450c
* Remove remaining GoogleCharts code and update documentationJames Moger2014-04-101-11/+0
|
* Update to JGit 3.3.1James Moger2014-03-271-9/+9
|
* Replace JCommander with args4jJames Moger2014-03-271-11/+11
|
* Update to JGit 3.3.0James Moger2014-03-051-53/+53
|
* Ticket tracker with patchset contributionsJames Moger2014-03-031-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Update to JGit 3.2.0James Moger2013-12-201-6/+6
| | | | Change-Id: I77475dedfecbdc7ba3c065886a51b7a70b7ece48
* Support Markdown image links relative to the repository root (issue-324)James Moger2013-12-091-9/+9
| | | | Change-Id: I8bad02b26a20636e4fc3d1f0ab0a16f0bacc7bf1
* Add support for per-repository bugtraq configurationJames Moger2013-12-031-0/+13
| | | | | | | | | | | | | | | | | | | Imported the reference implementation contributed by syntevo which is used in their SmartGit product. You may create a bugtraq config section inf your .git/config file OR you may add a .gitbugtraq file to the root of your repository. Example: [bugtraq "issues"] url = http://code.google.com/p/gitblit/issues/detail?id=%BUGID% logRegex = "[Ii]ssue[-#:\\s]{1}\\d+" logRegex1 = "\\d+" [bugtraq "[pullrequests"] url = "https://github.com/gitblit/gitblit/pull/%BUGID%" logRegex = "(?:pull request|pull|pr)\\s*[-#]?([0-9]+)" Change-Id: Iaba305bf4280d08cc4d1abf533c2f1365470a43f
* Bump bouncycastle version to 1.49David Ostrovsky2013-12-021-9/+9
| | | | Change-Id: I0ea81f6c45748af3130721b8f8a7244eac9787fc
* Update to Lucene 4.6.0 (pull request #124)James Moger2013-11-291-12/+45
| | | | Change-Id: I21b0daf0550dcc2f12f1712e7b7cf519358a7a1d
* Use Dagger to inject managers into all filters and servletsJames Moger2013-11-291-0/+45
| | | | Change-Id: I9bb2cc0cbfac9841b13bed15a474fefb24355cd4
* Update to Jetty 8.1.13 for Servlet 3James Moger2013-11-261-6/+6
| | | | Change-Id: If3f30af2ed250968e65cde58bd413213f4d384b1
* Add markup support for confluence, mediawiki, textile, trac, and twikiJames Moger2013-11-121-0/+66
| | | | Change-Id: I82ef161c6b6956c7b83cd4a1c37627beac6ea75b
* Replaced MarkdownPapers with pegdownJames Moger2013-10-181-3/+69
| | | | Change-Id: I11eb50ba1ef0bef8ac47bf6f7b17e0f79ecd3f2d
* Update to JGit 3.1.0James Moger2013-10-161-6/+6
| | | | Change-Id: I94d4f6146c79541bf8a36e4c3dca1842e46cddd5
* Updated to Jetty 7.6.13James Moger2013-10-021-6/+6
|
* Add commons-io to explicit dependencies.Florian Zschocke2013-08-261-11/+11
| | | | | | Add the commons-io library explicitly to the depencencies. It was already present as a transitive dependency but is now used in code. Using the version 2.2 as that got so far already packaged in ext.
* Add an Apache htpasswd user serviceFlorian Zschocke2013-08-121-11/+11
| | | | | | | Add a new class, HtpasswdUserService, which performs authentication against a text file created with the Apache 'htpasswd' program. Added dependency on commons-codec:1.7
* Added PAMUserService for local Linux/Unix/MacOSX account authenticationJames Moger2013-07-231-0/+11
|
* Updated to JGit 3.0.0.201306101825-rJames Moger2013-06-281-6/+6
|
* Added WindowsUserService using WaffleJames Moger2013-06-201-33/+44
|
* Generate filterable project/repository list with FreeMarkerJames Moger2013-06-191-0/+11
|
* Added support for authenticating against a Salesforce org.William Whittle2013-06-071-0/+33
|
* Completed migration to JGit 3.0.0-SNAPSHOTJames Moger2013-04-151-6/+17
|
* Restored missing Windows distrib files lost during the refactorJames Moger2013-03-281-20/+0
|
* Reorganized to Apache Standard Directory Layout & integrated MoxieJames Moger2013-03-271-46/+244
| | | | | | | | | This is a massive commit which reorganizes the entire project structure (although it is still monolithic), removes the Build classes, and switches to Moxie, a smarter Ant build tookit based on the original Gitblit Build classes. The Ant build script will likely require additional fine-tuning, but this is big step forward.
* Updated IDEA module descriptor for JGit 2.2.0James Moger2013-01-031-6/+6
|
* Update to Jetty 7.6.8James Moger2012-12-031-6/+6
|
* Update to MarkdownPapers 1.3.2James Moger2012-12-031-3/+25
|
* Eliminate internal Sun api for CRLs and include X509 tests in suiteJames Moger2012-11-231-0/+373