summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/Constants.java
Commit message (Collapse)AuthorAgeFilesLines
* Use existing setting but with new valuesFlorian Zschocke2022-08-141-0/+22
| | | | | | | | | | | Instead of adding another setting and having to explain how the new one and the existing `requireClientCertificates` setting are interdependent, let's use the existing setting and add new values. It is changed from a boolean to a string, with the values `required`, `optional` and `disabled`. To keep backward compatibility with the old values, the `true` value is mapped to `required` and the `false` value is mapped to `optional`.
* Revert "New rpc endpoint for listing all branches from a given repository"James Moger2017-01-251-1/+1
|
* New rpc endpoint for listing all branches from a given repositoryMarkus Fömpe2017-01-251-1/+1
|
* Merge branch 'fixMentionsInTickets-985'Florian Zschocke2016-12-121-0/+6
|\
| * Fix user mention regular expression and group replacement.merged--fixMentionsInTickets-985Florian Zschocke2016-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regular expression used for user mentions used to work only inside sentences. Also, since it tested for whitespace, the whitespace would get replaced, too, which would join lines together. Instead the new regex uses boundary matchers to match against word boundaires. As these are not capturing only the actual user mention can be captured and is then replaced. Also, this way the regex can ignore punctuation like in "@jim, look at this." Since Gibtlit now requires Java 7 we can use named capture groups. This makes the use of a centrally defined regular expression much safer. The (admittedly only) group to capture the user name is named "user" and can be referenced by this name. By using the name instead of a group number, the regex could be changed without the code using it breaking because the group number changed. A simple test is added for user mentions, which unfortunately has to deal with the full markdown replacement, too. Fixes #985
| * Introduce new constant REGEX_TICKET_MENTIONGlenn Matthys2016-12-101-0/+6
| |
* | Add integration strategy to merge tickes fast-forward or with commit.Florian Zschocke2016-10-281-0/+31
|/ | | | | | | | | | | | | Add the option to merge a ticket branch to the integration branch only when it can be fast-forwarded, or always with a merge commit, or by fast-foward if possible, otherwise with a merge commit. Adds a new property ticket.mergeType with the valid values FAST_FOWARD_ONLY, MERGE_ALWAYS and MERGE_IF_NECESSARY. Merging and canMerge were refactored to make use of a new IntegrationStrategy class for each type of strategy.
* Fix for #976 - Filestore links via browserPaul Martin2015-12-251-0/+4
| | | | | | | | | | | | | + GitLFS client support + FilestoreModel now parses meta file + Read meta heading from cache if available + Authentication based on accept headers for browser view filestore login + PathModel & PathChangeModel now understands filestore items + Zip & Rar downloads contain include filestore items + Filestore servlet returns LFS JSON error only if accepted by client + DiffStat now knows repository to allow identification of filestore items + Filestore items identified and returned via view, raw & blob links on blame, commitDiff, commit and Tree pages
* remove external account type in lieu of specific typeJoel Johnson2015-12-091-1/+1
| | | | | | | This was unused and causing provider lookup to fail in AuthenticationManager.findProvider() by changing it out from underneath. As a result, the supportXChanges methods weren't being reported correctly.
* implement an HTTP header AuthenticationProviderJoel Johnson2015-12-091-2/+2
|
* Git-LFS supportPaul Martin2015-10-101-0/+4
| | | | | | | | | | | | | | + Metadata maintained in append-only JSON file providing complete audit history. + Filestore menu item + Lists filestore items + Current size and availability + Link to GitBlit Filestore help page (top right) + Hooks into existing repository permissions + Uses default repository path for out-of-box operation with Git-LFS client + accessRestrictionFilter now has access to http method and auth header + Testing for servlet and manager
* prevent session fixation for external authenticationJoel Johnson2015-07-141-1/+3
| | | | | + use request instead of session to flag authentication status and user, for external authentication types
* Merge branch 'ticket/129' into developJames Moger2014-09-301-0/+2
|\
| * Remove Wicket references from non-Wicket packagesJames Moger2014-09-301-0/+2
| |
* | Allow authentication providers to control user and team role changesJames Moger2014-09-261-0/+18
| |
* | Return of Servlet3 servlet and filter loadingJames Moger2014-07-031-0/+2
| | | | | | | | This is a quick return of the servlet3-style code which was reverted mid-December 2013. It is not completely tested, but a casual review was done and it's looks good. The next steps should be to restore `@Inject` annotations, simplify *DaggerModule* boilerplate, and run this on a JEE container with CDI - like JBoss AS 7.
* | Refine startup ascii artworkJames Moger2014-07-021-0/+11
|/
* Simplified repository creation with a NewRepositoryPageJames Moger2014-06-031-0/+8
|
* Change enum name and unit test RSS tag queriesJames Moger2014-05-081-3/+3
|
* Updated the SyndicationServlet to provide an additional option to return ↵Gerard Smyth2014-05-081-0/+21
| | | | | | | | 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-3/+4
|
* Implement FORK RPC request typemanisha2014-05-081-1/+1
|
* Merge branch 'ticket/63' into developJames Moger2014-05-071-1/+6
|\
| * Fix transport determination for SSH urls on port 22James Moger2014-05-071-1/+6
| |
* | Replace RawPage with RawServletJames Moger2014-05-051-1/+1
| |
* | Split pages servlet into a raw branch servlet and a gh-pages servletJames Moger2014-05-041-0/+2
|/
* Allow specifying accepted PUSH transportsJames Moger2014-04-101-0/+19
|
* Support specifying permission levels for SSH public keysJames Moger2014-04-101-0/+2
|
* Revise SSH public key integration with AuthenticationManagerJames Moger2014-04-101-1/+1
|
* SSHD: Add support for git pack commandsDavid Ostrovsky2014-04-101-1/+1
| | | | | | | | | | | Add git-upload-pack and git-receive-pack commands. Conflicts: src/main/java/com/gitblit/manager/ServicesManager.java src/main/java/com/gitblit/transport/ssh/CommandDispatcher.java src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java Change-Id: I8c057b41f1dfad6d004e6aa91f96c8c673be9be2
* Move Gitblit branches to refs/meta/gitblitJames Moger2014-03-081-1/+1
|
* Add and document REINDEX_TICKETS rpc request typeJames Moger2014-03-061-1/+1
|
* Ticket tracker with patchset contributionsJames Moger2014-03-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Added filesystem write permission check (issue-345)James Moger2013-11-291-1/+3
| | | | Change-Id: I0a3aced3b8e9887347888c85e469b74fc70931ad
* Serve repositories on /r in addition to /gitJames Moger2013-11-291-0/+2
| | | | Change-Id: I3cd332a6509e434d901e1b262600f4c8ce57752b
* Refactor user services and separate authentication (issue-281)James Moger2013-11-291-1/+10
| | | | Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd
* Moved servlets and services to separate packagesJames Moger2013-11-291-1/+1
| | | | Change-Id: I5f0f50f4ae7d332e9f724a2e6f074fa71f646035
* Trim trailing whitespace and organize importsJames Moger2013-09-301-64/+68
| | | | Change-Id: I9f91138b20219be6e3c4b28251487df262bff6cc
* Remove issue artifacts from classes missed in previous purgeJames Moger2013-09-301-1/+1
| | | | Change-Id: Ie0b7d1e11d634577e943c8e4dbab080b0078f1b4
* Added setting to globally disable anonymous pushes in the receive packJames Moger2013-09-271-0/+11
| | | | Change-Id: I3460c9c0eeb32503d58325fd09793a0cd40aa2c4
* Add support for rendering Markdown commit messages (issue-203)Bret K. Ikehara2013-09-181-0/+13
|
* Implemented a graph servlet based on EGit/JGit's PlotWalk (issue-194)James Moger2013-09-171-0/+2
| | | | | | | | | The graph is generated server-side and therefore requires that the commit table row height be fixed and match the row height of the servlet. There will be layout misalignment if remotes refs are displayed. Perhaps this can be improved in the future. Change-Id: I39d0ffc7b1c3679976ce8c198c772ff86238f1a5
* Revisions and documentation for personal repository prefix changeJames Moger2013-09-171-0/+2
|
* Add an Apache htpasswd user serviceFlorian Zschocke2013-08-121-1/+1
| | | | | | | Add a new class, HtpasswdUserService, which performs authentication against a text file created with the Apache 'htpasswd' program. Added dependency on commons-codec:1.7
* Added PAMUserService for local Linux/Unix/MacOSX account authenticationJames Moger2013-07-231-1/+1
|
* Added GET_USER request to RPC interface (issue-275)James Moger2013-07-221-1/+1
|
* Added External account type to enumJames Moger2013-07-091-1/+1
|
* Added WindowsUserService using WaffleJames Moger2013-06-201-1/+1
|
* Minor tweaks to SalesForce user serviceJames Moger2013-06-171-1/+1
|
* Moved #externalAccount string to common constants classJames Moger2013-06-171-0/+2
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-03 08:16:24 +0000