summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/client
Commit message (Collapse)AuthorAgeFilesLines
* Fix NPE in GitblitClientJames Moger2014-06-131-3/+5
|
* Allow configuring the default integration branch for a repositoryJames Moger2014-03-081-1/+18
|
* Implement user "disabled" flag as an alternative to deleting the accountJames Moger2014-03-041-0/+5
|
* Ticket tracker with patchset contributionsJames Moger2014-03-031-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* issue-361: Reset user cookie after administrative password changeJames Moger2014-01-281-0/+3
| | | | | | | Cookies were not reset on administrative password change of a user account. This allowed accounts with changed passwords to continue authenticating. Cookies are now reset on password changes, they are validated on each page request, AND they will now expire 7 days after generation.
* Refactor user services and separate authentication (issue-281)James Moger2013-11-292-14/+3
| | | | Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd
* Remove artifact setting from manager dialogJames Moger2013-11-261-4/+0
| | | | Change-Id: I249a88994961c671a090cc33cd0eb8e506f6513e
* Eliminate the "enumerate documentation" repository settingJames Moger2013-11-142-8/+0
| | | | Change-Id: I3a7c13b4c626f8b5ea2a63717dfe4249c19eebb4
* Implement mirror executor (issue-5)James Moger2013-11-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | 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
* Remove "show readme" flag in favor of automatic detectionJames Moger2013-10-251-7/+0
| | | | | | | Automatic detection also will now also display a plain text "readme" or "readme.txt" file. Change-Id: Id6be729bdc469e7a5cfd1f4144df340a6b93475e
* Remove remaining TicGit tickets referencesJames Moger2013-09-302-15/+0
| | | | Change-Id: I431659cf1d57a8d9bffb065fa47e1296e7f8c838
* Trim trailing whitespace and organize importsJames Moger2013-09-3042-226/+345
| | | | Change-Id: I9f91138b20219be6e3c4b28251487df262bff6cc
* Change default access restriction to PUSHJames Moger2013-09-271-1/+1
| | | | Change-Id: I74b3f9fedd77294c53648f8eaa730d4a84917555
* Revisions and documentation for personal repository prefix changeJames Moger2013-09-172-6/+35
|
* Refactor logic for user repository path into one class.Florian Zschocke2013-08-262-3/+5
| | | | Gather logic for building the path/name of a personal user repository into one class.
* Refinements to push log display and daily digestsJames Moger2013-05-311-1/+1
| | | | | | * Properly support timezone-based date groupings * Polish css for the major browsers on Win & Linux * Use Gitblit constants for refs instead of JGit constants
* Improve Gerrit change ref rendering (issue-206)James Moger2013-04-231-0/+5
|
* Revised incremental push tags featureJames Moger2013-04-011-5/+5
|
* Merge branch 'autotagpush' of https://github.com/akquinet/gitblit into pushtagsJames Moger2013-04-011-0/+7
|
* Reorganized to Apache Standard Directory Layout & integrated MoxieJames Moger2013-03-2744-0/+9474
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.