summaryrefslogtreecommitdiffstats
path: root/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Set list of offered SSH authentication methods.merged--sshAuthMethodsFlorian Zschocke2016-12-062-9/+52
| | | | | | | | | | | | | | | | | Make the SSH authentication methods used by the server configurable, so that for example password authentication can be turned off. For this, a `git.sshAuthenticationMethods` setting is added which is a space separated list of authentication method names. Only the methods listed will be enabled in the server. This is modeled after the option of the same name from sshd_config, but it does not offer listing multiple required methods. It leaves the door open, though, for a later extension to support such a multi-factor authentication. Since this also includes Kerberos authentication with GSS API, this obsoletes the `git.sshWithKrb5` property. The latter is removed. Instead, to enable Kerberos5 authentication, add the method name `gssapi-with-mic` to the authentication methods list.
* Merge pull request #1087 from ↵Paul Martin2016-06-191-0/+1
|\ | | | | | | | | mereth/issues/964-session-loss-redirects-to-start-page Fixes #964 - add missing redirect after restoring user in new session
| * add missing redirect after restoring user in new sessionmereth2016-06-151-0/+1
| |
* | Merge pull request #1055 from gitblit/1048-TicketReferencesPaul Martin2016-06-1811-200/+952
|\ \ | |/ |/| Ticket Reference handling #1048
| * Ticket Reference handling #1048Paul Martin2016-04-2711-200/+952
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Supports referencing: + Tickets from other tickets via comments + Tickets from commits on any branch + Common TicketLink class used for both commits and tickets + TicketLink is temporary and persisted to ticket as a Reference + Support deletion of ticket references + Rebasing patchsets/branches will generate new references + Deleting old patchsets/branches will remove the relevant references + Substantial testing of use cases + With and without patchsets, deleting, amending + BranchTicketService used during testing to allow end-to-end ref testing + Relocated common git helper functions to JGitUtils
* | Merge pull request #1084 from metasim/youtrack-hookJames Moger2016-06-132-0/+254
|\ \ | | | | | | Initial implementation of a JetBrains YouTrack hook for GitBlit.
| * | Initial implementation of a JetBrains YouTrack hook for GitBlit.Simeon H.K. Fitch2016-06-032-0/+254
| | |
* | | fix baseURL handling in HttpUtils, fixes #1083Dirk Steinkopf2016-06-121-2/+14
| | |
* | | Fixes #1062 - Upgraded to Prosemirror 0.6.1Paul Martin2016-04-294-29/+36
| | |
* | | Merge pull request #1070 from gitblit/1061-filestoreSortByDatePaul Martin2016-04-282-3/+48
|\ \ \ | | | | | | | | Fixes #1061 - Most recent first on filestore page
| * | | Fixes #1061 - Most recent first on filestore pagePaul Martin2016-04-282-3/+48
| | |/ | |/|
* / | Use getInteger not getFilesize, fixes #1049James Moger2016-04-201-1/+1
|/ /
* | fixes #966 to prevent always searching all reposPaul Martin2016-04-161-3/+6
| |
* | Fixes #1028 - FilestorePage now pages and filtersPaul Martin2016-04-084-20/+207
| |
* | Fix for #962 - Delete patchset abilityPaul Martin2016-04-067-9/+187
| |
* | Fix for #1042 - Filestore items now shown as iconsPaul Martin2016-04-068-48/+17
| |
* | Fixes #882 Honour allow new ticket settingPaul Martin2016-04-061-1/+1
| |
* | Fix for #1037 myTickets now honours permissionsPaul Martin2016-04-041-5/+13
| |
* | Fix for #1034 Ticket Page ErrorPaul Martin2016-03-311-8/+10
| |
* | Friendly URL for EditFile Page #974Paul Martin2016-03-275-13/+37
| | | | | | | | + Prevent Edit of old doc version
* | Disable edit links in read only mode #974Paul Martin2016-03-272-5/+21
| |
* | Updating ProseMirror to 0.4.0Paul Martin2016-03-272-10/+10
| |
* | Document edit capability via ProseMirror submodule #974Paul Martin2016-03-2723-150/+1085
| | | | | | | | | | | | | | | | | | | | | | | | + New docEdit page with links from docPage and docList + Bespoke menu system with full screen edit mode + npm required for building client side scripts + Ant script added for BuildUI which performs npm commands + Update font-awesome to 4.5.0 + Factor out to JGitUtils common code in BranchTicketService for EditFilePage + getTreeEntries + commitIndex + Merge capability for document editing
* | Merge pull request #1032 from gitblit/1031-FixForRepositoryPagePaul Martin2016-03-271-2/+10
|\ \ | | | | | | Fix for #1031 to display error message
| * | Fix for #1031 to display error messagePaul Martin2016-03-261-2/+10
| | |
* | | Fix for #1018 and #1025 browser LFS linksPaul Martin2016-03-214-12/+279
|/ / | | | | | | | | + View and Raw both download the actual file + Blame will show the metafile
* | Merge pull request #988 from gitblit/976-raw-download-filestore-itemJames Moger2016-01-2523-128/+465
|\ \ | | | | | | Fix for #976 - Filestore links via browser
| * | Fix for #976 - Filestore links via browserPaul Martin2015-12-2523-128/+465
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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
* | | Merge pull request #990 from dbywalec/authenthication-of-federation-userJames Moger2016-01-161-0/+6
|\ \ \ | | | | | | | | Fix authentication failure warning log messages for FEDERATION_USER
| * | | Fix authentication failure warning log messages for FEDERATION_USERDariusz Bywalec2016-01-041-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The AuthenticationManager did not encounter for FEDERATION_USER and would unnecessarily generate a lot of failure warning log messages, e.g: Failed login attempt for $gitblit, invalid credentials from XXX.XX.XX.XX A simple condition will prematurely return null bypassing the regular authentication path and immediately make the authentication be routed via FederationManager.
* | | Merge pull request #991 from ↵James Moger2016-01-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | dbywalec/authentication-of-already-authenticated-user Lower log level of servlet authenticate when request is already authenticated
| * | | Lower log level of servlet authenticate when request is already authenticatedDariusz Bywalec2016-01-041-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When calling a servlet which has already been authenticated, the server would produce a lot of superfluous log entries, e.g: Called servlet authenticate when request is already authenticated. The log level for this log entry has been lowered down to DEBUG.
* / / Fix for #993 LIST_BRANCHES without adminBoris Stumm2016-01-061-13/+2
|/ / | | | | | | | | Replaced the canAccess() method in RpcFilter with !adminRequest, that should solve the problem.
* | Change Jenkins groovy script for any protocol (git/http/ssh)rgroux2015-12-161-1/+4
| | | | | | | | | | groovy.jenkinsGitbaseurl in gitblit.properties or web.xml can override the http default protocol
* | Merge pull request #980 from mrjoel/mrjoel-httpheadersJames Moger2015-12-106-12/+268
|\ \ | | | | | | Refactor authentication for servlet HTTP header handler
| * | remove external account type in lieu of specific typeJoel Johnson2015-12-092-4/+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-095-9/+268
| | |
* | | Merge pull request #981 from mrjoel/mrjoel-loguseraccessJames Moger2015-12-101-2/+2
|\ \ \ | | | | | | | | Log username with access logging
| * | | log authenticated usernameJoel Johnson2015-12-091-2/+2
| |/ /
* | | Merge pull request #982 from gitblit/978-milestone-date-selectorJames Moger2015-12-106-9/+181
|\ \ \ | | | | | | | | fix for #978 - HTML5 date input support
| * | | fix for #978 - HTML5 date input supportPaul Martin2015-12-096-9/+181
| |/ / | | | | | | | | | | | | | | | | | | | | | + JS patch/hack to coerce legacy wicket into talking to a HTML5 input type + JS script to hide inline help on date format when using HTML5 date picker + Date picker shown in user locale and standard does not support custom format. + Always sent in ISO8601 format
* / / revise logic for forcing dotfile to textJoel Johnson2015-12-091-1/+8
|/ /
* | Merge pull request #979 from pingunaut/masterJames Moger2015-12-081-31/+12
|\ \ | | | | | | Remove empty catch blocks to stop swallowing exceptions. #498
| * | Remove empty catch blocks to stop swallowing exceptions. #498 Martin Spielmann2015-12-081-31/+12
| | |
* | | fix for #967 filestore menu for all usersPaul Martin2015-12-077-38/+62
| | | | | | | | | | | | | | | | | | + Filestore listing filtered by user view permissions + Configuration help for filestore relocated to website files + Added migration example
* | | Merge pull request #969 from paulsputer/968-GitLFS-Extract-URI-From-RepositoryJames Moger2015-12-031-1/+1
|\ \ \ | |/ / |/| | fix for #968 extracting repository from URI
| * | fix for #968 extracting repository from URIPaul Martin2015-12-031-1/+1
| | | | | | | | | | | | + Allows using lfs when `server.contextPath = /git`
* | | Handle possible NPE when extracting WAR resources into a new directoryJames Moger2015-11-251-1/+7
| | |
* | | Fix 2 possible NullPointer occurencesmarco2015-11-232-1/+14
| | |
* | | Raw servlet now assumes text/plain for dot filesJames Moger2015-11-231-1/+1
| | |