summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/wicket
Commit message (Collapse)AuthorAgeFilesLines
* Conditionally hide the propose patchset instructionsJames Moger2014-03-071-9/+16
| | | | | | | | There are a few scenarios where a ticket without a patchset should not display propose instructions. 1. the ticket is resolved 2. the repository is configured to reject new patchsets or is read-only 3. the server is configured to reject new patchsets
* Fix NPE in the Edit Ticket pageJames Moger2014-03-071-2/+3
|
* fix some Chinese translations due to some special characters.Stardrad Yin2014-03-071-8/+8
|
* DocumentationJames Moger2014-03-061-1/+1
|
* Documentation and clarify git workflowsJames Moger2014-03-062-10/+6
|
* Updated the Dutch translation for 1.4.0Jeroen Baten2014-03-061-503/+664
|
* Merge pull request #148 from yin8086/ChineseTransJames Moger2014-03-061-98/+105
|\ | | | | Add and fix Chinese translations
| * Add Chinese translations for new strings, and fix translations based on ↵Stardrad Yin2014-03-061-98/+105
| | | | | | | | online page views of dev.gitblit.com
* | Merge pull request #149 from ds5apn/masterJames Moger2014-03-061-27/+27
|\ \ | |/ |/| fixed some Korean translations
| * correct some translationsDongsu, KIM2014-03-061-27/+27
| |
* | Translation esES updatedmrbytes2014-03-051-6/+161
| | | | | | | | | | | | - Ready for the 1.4.0 release plus a few Fixes Signed-off-by: mrbytes <eguervos@msn.com>
* | Add setting to hide the navbar for those embedding GitblitJames Moger2014-03-051-0/+3
| |
* | Centralized ticket editing permission controlsJames Moger2014-03-053-84/+78
| |
* | Delegate closed ticket changes to the Edit Ticket pageJames Moger2014-03-052-138/+160
| |
* | Allow unregistered milestone selection on edit ticket pageJames Moger2014-03-051-0/+7
| |
* | Allow changing status from edit ticket pageJames Moger2014-03-053-1/+27
| |
* | Allow integration (mergeTo) branch to be changed in edit ticketJames Moger2014-03-052-1/+34
| |
* | Localize the ticket activity tab field name changesJames Moger2014-03-052-2/+13
| |
* | Merge pull request #145 from yin8086/ChineseTransJames Moger2014-03-051-1/+8
|\ \ | | | | | | Fix Chinese translate strings
| * | Fix Chinese translate stringsStardrad Yin2014-03-051-1/+8
| | |
* | | Merge pull request #144 from ds5apn/masterJames Moger2014-03-051-482/+629
|\ \ \ | |/ / |/| / | |/ Update Korean Translation for Gitblit 1.4.0
| * Update Korean Translation for Gitblit 1.4.0Dongsu, KIM2014-03-051-482/+629
| |
* | Restart the response on the empty page if the repository has no commitsJames Moger2014-03-051-1/+2
| |
* | Externalize some additional stringsJames Moger2014-03-054-9/+14
| |
* | Prevent <nil> from being stored as a milestoneJames Moger2014-03-051-1/+1
| |
* | Implement user "disabled" flag as an alternative to deleting the accountJames Moger2014-03-045-7/+23
| |
* | Simplified propose instructions for an existing ticketJames Moger2014-03-041-2/+2
| |
* | Process bugtraq configuration in markup document renderingJames Moger2014-03-046-8/+12
| |
* | Add Chinese translation for 1.4.0Stardrad Yin2014-03-041-2/+149
|/
* Lower opacity for merge commit short messages in the log panelJames Moger2014-03-031-2/+3
|
* Ticket tracker with patchset contributionsJames Moger2014-03-0329-673/+5281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 apiJames Moger2014-03-039-120/+17
|
* Reduce use of final to avoid Wicket serialization issues in reflogsJames Moger2014-03-032-16/+15
|
* Fixed rounded timestamps of reflogsJames Moger2014-03-032-9/+2
|
* Eliminate problematic HEAD links from the blob, blame, and tree pagesJames Moger2014-03-036-13/+3
|
* Fix layouts on edit pages to properly use Bootstrap rows and spansJames Moger2014-03-033-8/+25
|
* CSS tweakJames Moger2014-03-034-4/+4
|
* Fix compare page exception when a submodule changes (issue-375)James Moger2014-03-031-0/+1
|
* Add an ajax text link and an icon ajax linkJames Moger2014-03-013-0/+98
|
* Add the No Docs page if there are no root documentsJames Moger2014-03-014-1/+66
|
* Fix potential NPE in creating a date labelJames Moger2014-03-011-2/+2
|
* Bypass Wicket bug related to url coding of array-type parametersJames Moger2014-03-011-0/+75
|
* Redirect to log page is the blobpage references a commit we can't findJames Moger2014-03-011-2/+1
|
* Gracefully recover history page from failure to find specified commitJames Moger2014-03-011-33/+48
|
* Exclude commit id from all author search linksJames Moger2014-02-283-3/+3
|
* Improve logging granularity of raw page missing commit, object, or blobJames Moger2014-02-281-13/+21
|
* Improve raw page failure to find specified fileJames Moger2014-02-281-0/+28
| | | | Change-Id: I9063a259d46cd164148ba5fea6c9c78684370fa2
* Fix author search links from compare pagesJames Moger2014-02-281-1/+1
|
* Fix regression in blame page due to issue-2, pr-125James Moger2014-02-282-2/+5
|
* Select default/configured gc period in create/edit repository pageJames Moger2014-02-211-0/+4
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 15:01:23 +0000