summaryrefslogtreecommitdiffstats
path: root/src/main/distrib/data
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1425 from srp-gmbh/jenkins_access_tokenFlorian Zschocke2022-12-091-1/+5
|\ | | | | Add support for Jenkins Git plugin access token, fixes #1423
| * Add support for Jenkins access token fixes #1423Tino Desjardins2022-09-031-1/+5
| |
* | Adjust path after moving from "gitblit" to "gitblit-org" on GithubFlorian Zschocke2022-12-092-2/+2
| |
* | Remove clippy.swf and update documentationFlorian Zschocke2022-12-031-1/+5
|/ | | | | | | | The `clippy.swf` Flash program is no longer needed and can be deleted. The configuration property is now incorrectly named, but we keep the name and update the documentation. Maybe it could be completely deleted one day, when the clipboard.js solution is known to work and be universally supported.
* Use existing setting but with new valuesFlorian Zschocke2022-08-141-5/+12
| | | | | | | | | | | 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`.
* Merge branch 'disable-client-certs' of github.com:oddeirik/gitblit into ↵Florian Zschocke2022-08-141-2/+11
|\ | | | | | | oddeirik-disable-client-certs
| * Add setting to explicitly enable or disable optional client certificates.Odd Eirik Nes2016-10-171-2/+11
| |
* | Update japanese translationTakehide Morimoto2022-01-151-0/+5
| |
* | Merge branch 'pingunaut-1166_more_secure_password_hashes' into master.Florian Zschocke2019-11-061-3/+5
|\ \
| * | Use the new PasswordHash classes.Florian Zschocke2019-11-051-4/+4
| | | | | | | | | | | | | | | | | | Integrate the `PasswordHash` class and subclass in the user and password editing and authentication. Replaces the old code and the previous `SecurePasswordHashingUtils` class.
| * | Added possibility to use secure hashes to store passwordsMartin Spielmann2017-01-011-3/+5
| | | | | | | | | | | | Addresses #1166
* | | Set default to `expanded` for collapsible repo groups.Florian Zschocke2019-06-151-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the new property `web.collapsibleRepositoryGroups` into the `web` section, close to the list type property. Set the default to be `expanded`, so that the new feature is visible but the list is still the full list like before. Add new value `tree` to the description of the property `web.repositoryListType`.
* | | collapsible group repositoriesybosy2019-06-151-0/+14
| | |
* | | Rename the setting to httpIdleTimeoutSebastiano Pilla2017-06-031-2/+2
| | |
* | | Adds theSebastiano Pilla2017-06-011-0/+7
| | | | | | | | | | | | | | | | | | server.httpTimeout setting to allow cloning big repositories over HTTP. This change fixes the java.util.concurrent.TimeoutException issue described in https://groups.google.com/d/topic/gitblit/UvDC48NpmF4/discussion .
* | | Sending email (certificate zip file) based on locale that user selectedwilliam2017-01-242-0/+116
| | |
* | | Merge pull request #6 from fzs/sshAuthMethodsFlorian Zschocke2017-01-211-3/+18
|\ \ \ | |/ / |/| | Set list of offered SSH authentication methods.
| * | Set list of offered SSH authentication methods.merged--sshAuthMethodsFlorian Zschocke2016-12-061-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Fix typo in defaults.properties.Florian Zschocke2016-12-181-1/+1
| | |
* | | Merge pull request #1160 from fzs/sshLdapAuthenticatorFlorian Zschocke2016-12-181-0/+16
|\ \ \ | | | | | | | | LDAP SSH key manager
| * | | Extend documentation in default.properties and LdapKeyManager.java.merged--sshLdapAuthenticatorFlorian Zschocke2016-12-061-1/+5
| | | |
| * | | Retrieve public SSH keys from LDAP.Florian Zschocke2016-11-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new class `LdapPublicKeyManager` which retrieves public SSH keys from LDAP. The attribute can be configured with the new configuration option `realm.ldap.sshPublicKey`. The setting can be a simple attribute name, like `sshPublicKey`, or an attribute name and a prefix for the value, like `altSecurityIdentities:SshKey`, in which case attributes are selected that have the name `altSecurityIdentities` and whose values start with `SshKey:`.
* | | | Merge pull request #1149 from fzs/fixLDAPbindingJames Moger2016-11-141-2/+15
|\| | | | | | | | | | | Fix LDAP binding strategies
| * | | Update documentation for LDAP binding in default.properties.merged--fixLDAPbindingFlorian Zschocke2016-11-141-2/+15
| |/ / | | | | | | | | | | | | Extend the comments for some realm.ldap.* properties to better explain use cases and requirements.
* | | Merge pull request #1142 from fzs/merge-strategyJames Moger2016-10-281-0/+15
|\ \ \ | |_|/ |/| | Merge strategy
| * | Add integration strategy to merge tickes fast-forward or with commit.Florian Zschocke2016-10-281-0/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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 &rt; to > in mail (in rename status line)Guilliam Xavier2016-07-291-1/+1
|/ | | fixes #1104
* Merge pull request #1055 from gitblit/1048-TicketReferencesPaul Martin2016-06-181-0/+7
|\ | | | | Ticket Reference handling #1048
| * Ticket Reference handling #1048Paul Martin2016-04-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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
| |
* | 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
* | implement an HTTP header AuthenticationProviderJoel Johnson2015-12-091-0/+37
| |
* | Git-LFS supportPaul Martin2015-10-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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
* | Merge branch 'topic/pr-934' into developJames Moger2015-10-051-0/+6
|\ \
| * | Address review commentsJames Moger2015-10-051-2/+3
| | |
| * | Allow to strip domain from kerberos usernamesVitaliy Filippov2015-10-011-0/+5
| | |
* | | Revert manual specification of ssh user auth factoriesJames Moger2015-10-051-13/+7
|/ /
* | allow advertising gitblit privileges for external URLsJoel Johnson2015-07-011-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Renamed ssh.Display(Host|Port) to ssh.Advertised(Host|Port)James Moger2015-06-151-2/+2
| |
* | Added git.sshDisplay{Port|Host} to hide port forward.Morten Bøgeskov2015-06-151-0/+12
| | | | | | | | | | | | Running gitblit in a container it's easy to expose the ssh on the default port. Using git.sshDisplayPort/git.sshDisplayHost you can expose the forwarded address as the official location.
* | Merged #258 "Create an avatar provider that defaults to Gravatar"James Moger2015-06-151-0/+5
|\ \
| * | Revised AvatarGenerator to be injectableJames Moger2015-06-151-2/+0
| | |
| * | First draft for a customized avatar imageFabrice Bacchella2015-06-151-0/+7
| | |
* | | allow configuring of internal URLs offeredJoel Johnson2015-06-121-0/+18
|/ /
* | Implement configurable tab length support for blob viewsJames Moger2015-05-221-0/+5
| |
* | Merged #247 "Add Kerberos5/GSS authentication to ssh"James Moger2015-05-211-0/+22
|\ \
| * | Adding Kerberos5/GSS authentication to sshFabrice Bacchella2015-05-041-0/+22
| | | | | | | | | | | | Adding the possibility to define authentication method order for ssh
* | | A patch that allows to extract a new user informations from the HTTP sessionFabrice Bacchella2015-05-151-0/+16
|/ / | | | | | | if the webapp container can fill it.
* | GitBlit no longer uses Google chartsSteven Oliver2015-01-021-1/+1
| |