summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/manager
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1142 from fzs/merge-strategyJames Moger2016-10-281-0/+9
|\ | | | | Merge strategy
| * Add integration strategy to merge tickes fast-forward or with commit.Florian Zschocke2016-10-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Issue #1076: load commit cache in a background threadTom2016-10-271-27/+35
|/ | | | | | | | | | * Make the CommitCache fully thread-safe. It was using a ConcurrentHashMap containing lists, but then handed out these lists. It also did multiple operations on that map that as a whole should be atomic. * Use isEmpty() instead of size() == 0. * Run the loading of the commit cache in a background daemon thread
* Use getInteger not getFilesize, fixes #1049James Moger2016-04-201-1/+1
|
* 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.
* | 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.
* implement an HTTP header AuthenticationProviderJoel Johnson2015-12-091-2/+20
|
* fix for #967 filestore menu for all usersPaul Martin2015-12-073-6/+31
| | | | | | + Filestore listing filtered by user view permissions + Configuration help for filestore relocated to website files + Added migration example
* Fix 2 possible NullPointer occurencesmarco2015-11-231-0/+4
|
* Fix failure to start WAR variantsJames Moger2015-11-231-88/+88
|
* Create filestore directory on startupJames Moger2015-11-191-2/+4
|
* Catch some potential NPEsJames Moger2015-11-181-0/+7
|
* Log update for Fail2Ban usagePaul Martin2015-10-253-19/+24
| | | | | + Adds standard logging for all authentication providers + Updates help page to use default GitBlit SSH port
* Git-LFS supportPaul Martin2015-10-104-2/+567
| | | | | | | | | | | | | | + 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-10/+25
| | | | | + use request instead of session to flag authentication status and user, for external authentication types
* Merge pull request #281 from mrjoel/mrjoel-ticketswithexternalurlJames Moger2015-07-041-9/+28
|\ | | | | allow internal privilege evaluation external URLs
| * allow advertising gitblit privileges for external URLsJoel Johnson2015-07-011-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c20191fc0931a19bec0df1ab2b56f287e5d8b7c7 enabled support for hiding internal URLs, but didn't consider that it broke the evaluation of permissions (used for tickets, etc.), and caused a NPE on repoUrl.permission when trying to view the TicketPage. With all internal mechanisms disabled, it would result in the first URL being external with unknown permissions. This adds an option to use internal permissions even for external URLs. Note that this does not grant any additional permissions, but does offer the option to have gitblit advertise the full set of what is allowed, even if the external URL imposes additional restrictions.
* | fix comment typoJoel Johnson2015-07-011-1/+1
|/
* Merge pull request #282 from mrjoel/mrjoel-fixhttpurlpermsJames Moger2015-06-301-2/+3
|\ | | | | fix permission capping for HTTP/HTTPS
| * fix permission capping for HTTP/HTTPSJoel Johnson2015-06-301-2/+3
| | | | | | | | | | | | Previously used request scheme, but request scheme is unrelated to the URL being generated. Instead, base the permission capping on the scheme of the URL itself.
* | typo: instantiate log messageJoel Johnson2015-06-291-1/+1
|/
* allow configuring of internal URLs offeredJoel Johnson2015-06-121-3/+6
|
* Merged #255 "Invalid kerberos patches, works now and with a test."James Moger2015-05-273-0/+44
|\
| * Invalid kerberos patches, works now and with a test.Fabrice Bacchella2015-05-263-0/+44
| |
* | Two slight improvement for custom UserService:Fabrice Bacchella2015-05-261-2/+4
|/ | | | | - try userRealm as a file only if class is not found, other exeptions are real error - log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString
* Add onFork and onRename methods to RepositoryLifeCycleListenerJames Moger2015-05-222-1/+22
|
* A patch that allows to extract a new user informations from the HTTP sessionFabrice Bacchella2015-05-151-0/+48
| | | | if the webapp container can fill it.
* Update SLF4j, JGit, Groovy, BouncyCastle, Mina, Gson, Freemarker, libpam4j, ↵James Moger2015-03-051-9/+6
| | | | args4j, Jedis, waffle-jna, Unboundid
* Merge branch 'ticket/237' into developJames Moger2015-02-111-1/+3
|\
| * Add 'UTF8' encoding aliasJames Moger2015-02-111-1/+3
| |
| * Fix PluginManager not properly respecting --noverifyJames Moger2014-10-271-0/+4
| |
* | Add support for specifying the `Proxy-Authorization` header for the ↵James Moger2014-12-031-2/+3
| | | | | | | | PluginManager
* | Add support for configurable HTTP proxy host/port in PluginManager.javaDariusz Bywalec2014-12-021-1/+9
| | | | | | | | | | Formerly by default the PluginMaganer would support no proxy setting. For servers behind firewall and HTTP proxy this would prevent installation of gitblit plugins.
* | Allow finer-grained determination of available transport preferencesJames Moger2014-10-312-6/+39
| |
* | Adopt chain-loading properties as the default setupJames Moger2014-10-271-5/+4
| |
* | Fix broken implementation of --noverify for installing a plugin from a urlJames Moger2014-10-231-1/+5
| |
* | Merge branch 'ticket/129' into developJames Moger2014-09-301-16/+11
|\|
| * Remove Wicket references from non-Wicket packagesJames Moger2014-09-301-16/+11
| |
* | Merge branch 'ticket/201' into developJames Moger2014-09-301-2/+0
|\|
| * Remove git.streamFileThreshold settingJames Moger2014-09-301-2/+0
| |
* | Allow authentication providers to control user and team role changesJames Moger2014-09-263-0/+53
| |
* | Merge branch 'ticket/187' into developJames Moger2014-09-253-2/+69
|\|
| * Restrict Gitblit cookie to the context pathJames Moger2014-09-253-2/+69
| |
* | Merge branch 'ticket/173' into developJames Moger2014-09-083-1/+35
|\|
| * Fix MigrateTickets failure for view-restricted repositoriesJames Moger2014-09-083-1/+35
| |
* | Merge branch 'ticket/161' into developJames Moger2014-09-082-8/+6
|\|
| * Expose setting to control Lucene repository indexing frequencyJames Moger2014-09-082-8/+6
| |
* | Merge branch 'ticket/164' into developJames Moger2014-09-073-3/+33
|\|
| * Create infrastructure for XSS sanitizationJames Moger2014-09-073-3/+32
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-02 02:23:13 +0000