Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged #80 "Replace Dagger with Guice" | James Moger | 2014-07-03 | 1 | -4/+6 |
|\ | |||||
| * | Adjust builds for appropriate dependencies | James Moger | 2014-07-03 | 1 | -4/+6 |
| | | |||||
* | | Update to Moxie 0.9.4 | James Moger | 2014-07-03 | 1 | -1/+1 |
|/ | |||||
* | Gitblit GO artefacts use release name for root directory. | Alex Lewis | 2014-06-30 | 1 | -19/+24 |
| | |||||
* | Fix WAR web.xml generation regression | James Moger | 2014-06-17 | 1 | -8/+5 |
| | |||||
* | Update build script for git-flow releases | James Moger | 2014-06-16 | 1 | -1/+23 |
| | |||||
* | Documentation | James Moger | 2014-06-09 | 1 | -2/+4 |
| | |||||
* | Add link to Gitblit's Docker file in the Docker registry | James Moger | 2014-06-09 | 1 | -0/+2 |
| | |||||
* | Update to Moxie 0.9.2 | James Moger | 2014-06-09 | 1 | -1/+1 |
| | |||||
* | Switch to basic ant copy filter for web.xml | James Moger | 2014-06-09 | 1 | -4/+18 |
| | |||||
* | Simplified repository creation with a NewRepositoryPage | James Moger | 2014-06-03 | 1 | -0/+6 |
| | |||||
* | Remove the OpenShift Express build | James Moger | 2014-05-23 | 1 | -73/+1 |
| | |||||
* | Correct Bintray upload url for releases | James Moger | 2014-05-07 | 1 | -1/+1 |
| | |||||
* | Documentation | James Moger | 2014-05-07 | 1 | -8/+4 |
| | |||||
* | Install sources artifact to Maven and Moxie repositories for ant builds | James Moger | 2014-04-13 | 1 | -4/+14 |
| | |||||
* | Documentation | James Moger | 2014-04-12 | 1 | -2/+4 |
| | |||||
* | Improve plugin documentation | James Moger | 2014-04-11 | 1 | -4/+12 |
| | |||||
* | Split administration commands into a plugin, enhance plugin manager | James Moger | 2014-04-10 | 1 | -14/+28 |
| | |||||
* | Documentation | James Moger | 2014-04-10 | 1 | -0/+4 |
| | |||||
* | Start SSH usage documentation | James Moger | 2014-04-10 | 1 | -6/+8 |
| | |||||
* | Documentation | James Moger | 2014-03-30 | 1 | -0/+2 |
| | |||||
* | Replaced uploading to GoogleCode with uploading to Bintray on release | James Moger | 2014-03-07 | 1 | -68/+37 |
| | |||||
* | Document ticket replication, mirroring, and advanced administration | James Moger | 2014-03-06 | 1 | -1/+3 |
| | |||||
* | Documentation | James Moger | 2014-03-04 | 1 | -2/+4 |
| | |||||
* | Update site structure | James Moger | 2014-03-04 | 1 | -0/+6 |
| | |||||
* | Ticket tracker with patchset contributions | James Moger | 2014-03-03 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | Add subgit hook contributed by TMate Software | James Moger | 2014-02-27 | 1 | -0/+1 |
| | |||||
* | Documentation | James Moger | 2014-02-26 | 1 | -18/+34 |
| | |||||
* | Add Redmine Fetch groovy hook (issue-359) | Berke Viktor | 2014-01-28 | 1 | -0/+1 |
| | |||||
* | Added fisheye hook script | Vitaly Litvak | 2014-01-28 | 1 | -0/+1 |
| | |||||
* | Refactor managers and authentication for federation | James Moger | 2013-11-29 | 1 | -1/+2 |
| | | | | Change-Id: I5ff18b2768095fb14e7fbece2e756115829abbde | ||||
* | Use Dagger to inject managers into all filters and servlets | James Moger | 2013-11-29 | 1 | -56/+2 |
| | | | | Change-Id: I9bb2cc0cbfac9841b13bed15a474fefb24355cd4 | ||||
* | Update to Moxie 0.9.1 | James Moger | 2013-11-29 | 1 | -1/+1 |
| | | | | Change-Id: I8e0479b632af3b5ca809aacf955e4be96822ac2c | ||||
* | Add pull request linking in changelog to generated documentation | James Moger | 2013-11-22 | 1 | -1/+3 |
| | | | | Change-Id: I06dbc0fdad93c042d783c97378429856bd9111bf | ||||
* | Update Moxie to 0.9.0 | James Moger | 2013-11-19 | 1 | -2/+2 |
| | | | | Change-Id: Ia4c9536282af6df3d9d462946dec1d8112459242 | ||||
* | Implement mirror executor (issue-5) | James Moger | 2013-11-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The mirror executor will fetch ref updates for repository mirrors. This feature is disabled by default and can be enabled by setting git.enableMirroring=true. The period between update checks is configurable, but it is global. An individual rpeository may not set it's own update schedule. Requirements: 1. you must manually clone the repository using native git git clone --mirror git://somewhere.com/myrepo.git 2. the "origin" remote must be the mirror source 3. the "origin" repository must be accessible without authentication OR the credentials must be embedded in the origin url (not recommended) Notes: 1. "origin" SSH urls are untested and not likely to work 2. mirrors cloned while Gitblit is running are likely to require clearing the gitblit cache (link on the repositories page of an administrator account) 3. Gitblit will automatically repair any invalid fetch refspecs with a "//" sequence. Change-Id: I4bbe3fb2df106366ae4c2313596d0fab0dfcac46 | ||||
* | Update to JGit 3.1.0 | James Moger | 2013-10-16 | 1 | -1/+1 |
| | | | | Change-Id: I94d4f6146c79541bf8a36e4c3dca1842e46cddd5 | ||||
* | Update to Moxie 0.8.2 | James Moger | 2013-09-05 | 1 | -1/+1 |
| | |||||
* | Restore blockpush and localclone hooks to binaries (issue-303) | James Moger | 2013-09-05 | 1 | -0/+2 |
| | |||||
* | Update to Moxie 0.8.1 and include gbapi in Maven repository on RELEASE build | James Moger | 2013-08-09 | 1 | -6/+6 |
| | |||||
* | Update to Moxie 0.8.0 | James Moger | 2013-08-07 | 1 | -1/+1 |
| | |||||
* | Removed obsolete/legacy code from build script | James Moger | 2013-07-25 | 1 | -110/+4 |
| | |||||
* | Added maintaining a Maven repository to the build release process | James Moger | 2013-07-25 | 1 | -1/+14 |
| | |||||
* | Documentation | James Moger | 2013-07-24 | 1 | -1/+1 |
| | |||||
* | Copy static files to classes dir. | Gustavo Henrique | 2013-07-24 | 1 | -0/+7 |
| | |||||
* | Added missing GitblitWicketFilter to War and Express builds (issue-274) | James Moger | 2013-07-24 | 1 | -1/+3 |
| | |||||
* | Added PAMUserService for local Linux/Unix/MacOSX account authentication | James Moger | 2013-07-23 | 1 | -0/+2 |
| | |||||
* | Ensure Keys class is included with all builds | James Moger | 2013-07-17 | 1 | -0/+4 |
| | |||||
* | Fixed missing model classes in Gitblit Manager build | James Moger | 2013-07-15 | 1 | -0/+5 |
| | |||||
* | Fixed GoogleCode upload target until they turn off downloads :( | James Moger | 2013-07-14 | 1 | -25/+46 |
| |