summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/wicket/pages/BasePage.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix regression in BasePage due to changes in page construction for bottom ↵James Moger2014-11-251-20/+19
| | | | script injection
* Typo in comment, and optional semicolon in JSTom2014-11-131-1/+1
|
* Support for adding bottom scriptsTom2014-11-121-0/+39
| | | | | | | | | | | Needed if we want to have opacity changes in image diffs because jQuery is bottom-loaded, so we must ensure that any scripts using jQuery are run later. I'm not a Wicket expert; maybe there's a cleverer or cleaner way to do this. There is a JavascriptUtils class in Wicket, but that writes to the response -- I don't quite see how that would give me control over the precise placement of the scripts to ensure they come after that bottom-loaded jQuery.
* Rename redirect methodJames Moger2014-09-301-3/+3
|
* Bypass Wicket redirects after AJAX form submissions, they break TomcatJames Moger2014-09-301-0/+11
|
* Specify response header X-Frame-Options SAMEORIGIN for generated pagesJames Moger2014-09-051-0/+3
|
* Replace RawPage with RawServletJames Moger2014-05-051-0/+4
|
* Add setting to hide the navbar for those embedding GitblitJames Moger2014-03-051-0/+3
|
* Ticket tracker with patchset contributionsJames Moger2014-03-031-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Allow overriding the page title in a page subclassJames Moger2013-12-301-3/+7
| | | | Change-Id: I4bf65f771ab1ba0b0da6838fb07007520dd4b5e1
* Do not serialize the Logger instanceJames Moger2013-12-301-8/+13
| | | | Change-Id: Icbef95e95d05fa8d7dbdc750241252d291083820
* Eliminate nearly all direct GitBlit singleton references in WicketJames Moger2013-11-261-20/+19
| | | | | | | | | | This is the first step towards modularization and injection. All direct references to the GitBlit singleton within the Wicket pages and panels have been replaced to proxy methods in the GitBlitWebApp singleton. There are still two Wicket classes which rely on the GitBlit singleton; those require manual instantiation (servlet 3). Change-Id: I0cdbbcf87959d590c446c99abb09c07c87c737bc
* Refactor access to home page classJames Moger2013-11-261-1/+1
| | | | Change-Id: Ice5706dc0659a44f54e5bf29ca66580e3be22418
* Allows the home root link top-left anchor to be customised.Luca Milanesio2013-11-081-1/+2
| | | | | | | A new property web.rootLink has been introduced to customise the link underlying the top-left logo in GitBlit. When undefined the older behaviour is to link to the GitBlit home page.
* Set Link: <url>; rel="canonical" http header for SEO (issue-304)James Moger2013-10-251-0/+13
| | | | Change-Id: Ie023b5fc58bf988e9064700918a79718aaa6c94b
* Trim trailing whitespace and organize importsJames Moger2013-09-301-22/+22
| | | | Change-Id: I9f91138b20219be6e3c4b28251487df262bff6cc
* Add setting to cap number of activity days to displayOri Livneh2013-08-111-0/+4
| | | | | | | This patch adds a setting, 'web.activityDurationMaximum', that specifies the maximum number of days of activity that may be requested. The default value is 30. When the number of days requested exceeds this value, the request is handled as though the maximum value was requested.
* Implemented optional page cachingJames Moger2013-07-191-1/+66
|
* Improve error handling within a repository page (issue-252)James Moger2013-06-101-13/+19
|
* Refinements to push log display and daily digestsJames Moger2013-05-311-1/+4
| | | | | | * Properly support timezone-based date groupings * Polish css for the major browsers on Win & Linux * Use Gitblit constants for refs instead of JGit constants
* Overhauled navigation and flattened lookJames Moger2013-05-191-51/+3
|
* Fixed sitename in page titleJames Moger2013-05-161-3/+4
|
* Improve page titleChad Horohoe2013-05-151-2/+2
| | | | | | - When viewing a repository, users want to know what repo they're on. Currently, it's usually pushed out of view - Use siteName for the title instead of the server name
* Implemented application menus for repository url panelJames Moger2013-05-091-59/+0
|
* Partially merged url panel with optional support for app clone urlsJames Moger2013-05-031-27/+0
|
* Added SparkleShare invite url panelJames Moger2013-05-021-1/+28
| | | | | This will probably be merged into a refined, single multi-protocol url panel.
* Improved the repository url panel and show git daemon url, appropriatelyJames Moger2013-05-021-0/+42
| | | | | This will probably be refined some more to merge the http/https and git urls into a single url panel.
* Enforce security on raw blob page (issue 198)James Moger2013-03-291-34/+1
|
* Reorganized to Apache Standard Directory Layout & integrated MoxieJames Moger2013-03-271-0/+460
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.