summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/utils
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/100' into release-v1.6.0James Moger2014-06-121-1/+3
|\
| * Fix cloning repositories with + in their namesJames Moger2014-06-121-1/+3
| |
* | Merge branch 'ticket/89' into developJames Moger2014-05-291-2/+4
|\|
| * Fix thread exhaustion in SSH daemonJames Moger2014-05-291-2/+4
| |
* | Render GFM links using Markdown, not direct HTMLJames Moger2014-05-221-2/+2
| |
* | Change enum name and unit test RSS tag queriesJames Moger2014-05-081-0/+57
| |
* | Updated the SyndicationServlet to provide an additional option to return ↵Gerard Smyth2014-05-081-1/+47
| | | | | | | | | | | | | | | | details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
* | Revise, complete, and fully test the FORK rpcJames Moger2014-05-081-8/+13
| |
* | Implement FORK RPC request typemanisha2014-05-081-11/+20
|/
* [findbugs] Explicitly catch thrown exceptions in X509UtilsJames Moger2014-04-171-1/+3
|
* [findbugs] Add null check on decoding a string in StringUtilsJames Moger2014-04-171-1/+1
|
* [findbugs] Add null check when closing a RevWalk in JGitUtilsJames Moger2014-04-171-4/+8
|
* [findbugs] Fix potential NPE in DiffStat generationJames Moger2014-04-171-3/+3
|
* [findbugs] Fix incorrect key lookup in commit cacheJames Moger2014-04-171-2/+4
|
* Remove @Inject annotationJames Moger2014-04-171-3/+0
|
* Removed obsolete Gravatar profile codeJames Moger2014-04-151-46/+0
|
* Improve plugin manager based on upstreamed contributions to pf4jJames Moger2014-04-101-1/+1
|
* Improve command help with formatting and usage examplesJames Moger2014-04-101-1/+1
|
* Reformat CmdLineParserJames Moger2014-04-101-367/+360
|
* Support querying in tickets ls and accept Object[][] for table dataJames Moger2014-04-101-11/+11
|
* Improve table rendering and uer details displayJames Moger2014-04-101-9/+29
|
* Integrate a patched version of FlipTables and improve ls outputJames Moger2014-04-101-0/+211
|
* Eliminate use of Dagger and do not create inner classesJames Moger2014-04-101-16/+22
| | | | | | | | | | | This change outlines somethings I'd like to see in your latest code. 1. Elimination of Dagger 2. Less noise from inner class instantiation 3. Formalizing filesystem location for keys instead of Unix-y /tmp/ 4. Password authentication as alternative to Key authentication Change-Id: I7a76e1811ad7cd545444fd8b59bbe8c4f45ccfec
* SSHD: Add support for generic commandsDavid Ostrovsky2014-04-105-0/+933
| | | | Change-Id: I5a60710323ca674d70e34f7451422ec167105429
* Workaround pegdown bug and improve relative image path processingJames Moger2014-03-111-3/+10
|
* Move Gitblit branches to refs/meta/gitblitJames Moger2014-03-081-59/+59
|
* Fix 'head' vs 'HEAD' commit resolutionJames Moger2014-03-071-1/+1
|
* Fixed bug in merge: improper use of force and failing on FORCED resultJames Moger2014-03-061-5/+5
|
* Add and document REINDEX_TICKETS rpc request typeJames Moger2014-03-061-0/+31
|
* Process bugtraq configuration in markup document renderingJames Moger2014-03-041-7/+21
|
* Fix reflog parsing bug of null compare links on branch creationJames Moger2014-03-031-2/+0
|
* Ticket tracker with patchset contributionsJames Moger2014-03-034-8/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 flatten string array to StringUtilsJames Moger2014-03-011-0/+12
|
* Encode ampersand in urlJames Moger2014-03-011-0/+2
|
* Launch bugtraq links in a new tabJames Moger2014-03-011-1/+1
|
* Add simplified transformGFM method to MarkdownUtilsJames Moger2014-03-011-0/+45
|
* Improve getting changed paths in a commit rangeJames Moger2014-03-011-1/+31
|
* Properly dispose RevWalk in getCommitJames Moger2014-03-011-2/+9
|
* Add method to calculate the diffstat between two commitsJames Moger2014-03-011-0/+32
|
* Added join methods to array utilsJames Moger2014-03-011-0/+17
|
* Fixed incorrect tagger identity on dashboards (issue-276)James Moger2014-01-141-2/+2
|
* Evaluate X_Forwarded_Context only when X-Forwarded-Context is not setBenjamin Asbach2014-01-041-1/+1
|
* Simplify blob loading codeJames Moger2013-12-031-24/+3
| | | | Change-Id: I7f8ad8936e620dd06e88d85f6837248eea75a1ec
* Add support for per-repository bugtraq configurationJames Moger2013-12-031-7/+52
| | | | | | | | | | | | | | | | | | | 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
* Add coloring modes to the blame page (issue-2, pull request #125)Alex Lewis2013-12-021-0/+135
| | | | | | | | | Blame output is now colored according to Commit (default), Author or Age. Both Commit and Author output uses random colors whereas Age uses a single color with varying tints applied to indicate the age. White indicates the eldest commit with the tint darkening as the commits get younger. Change-Id: I045458329af4765e91d5829ce3e8d28e21eeb66e
* Invalidate all cached repository data on "clear cache" (issue-346)James Moger2013-11-291-0/+4
| | | | Change-Id: I14404e38bbc6f5827c430849baf3c13f4df2c6ef
* Extract UserManager from GitBlit singletonJames Moger2013-11-291-0/+21
| | | | Change-Id: I4885255ed63aa6c4e000c3e5501675440dca3958
* Define manager interfaces and update all of Gitblit to use managersJames Moger2013-11-261-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | These manager interfaces define how the GitBlit singleton will eventually be split into smaller component managers. The Wicket app and all servlets have been updated to request the needed managers. There are _very_ few method signature changes - although there are a handful. This is a surgical sharding of responsibility based on a proof of concept refactor. Instead of random references to GittBlit.self() there are now precise references to the manager interface required to accomplish some task. Some tasks may require references to multiple managers. The code is now littered with calls to GitBlit.getManager(class) and those familiar with the code-base will no doubt notice the duplication of methods from IUserService in IUserManager and the addition of implementation methods in the GitBlit context class. When the GitBlit class is broken apart and the existing external authentication user service classes are refactored to AuthenticationService classes, this will again simplify and flatten. But in order to safely and cleanly modularize the stable code-base we will have to live with a little duplication for a short while. Change-Id: I7314ec8acaab2dcc6092785ed4434cc09fdbbe16
* Eliminate nearly all direct GitBlit singleton references in WicketJames Moger2013-11-261-0/+126
| | | | | | | | | | 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
* Automatically adjust web.forwardSlash on Tomcat containersJames Moger2013-11-261-45/+21
| | | | | | | | | | | | | One issue that frequently arises in the discussion group and the bug tracker is how Tomcat automatically re-encodes %2f as '/' which breaks url parameters with %2f. After documenting this in half a dozen places it still comes up. Clearly I haven't done enough. Gitblit will now act on, instead of just report, an improperly configured web.forwardSlash character on Tomcat containers. This will make Gitblit "just work" for more users and will make the world a better place. Change-Id: I344428804070a2d6082022cf6b80e2a3d83cea84
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-29 00:08:28 +0000