summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Renamed ssh.Display(Host|Port) to ssh.Advertised(Host|Port)James Moger2015-06-155-19/+19
|
* Added git.sshDisplay{Port|Host} to hide port forward.Morten Bøgeskov2015-06-155-12/+49
| | | | | | 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-1523-40/+247
|\
| * Revised AvatarGenerator to be injectableJames Moger2015-06-1511-108/+142
| |
| * First draft for a customized avatar imageFabrice Bacchella2015-06-1521-40/+213
| |
* | Merge pull request #263 from jeyoung/netbeans_supportJames Moger2015-06-151-135/+0
|\ \ | | | | | | Reworked NetBeans project to be based on the pom.xml rather than the …
| * | Reworked NetBeans project to be based on the pom.xml rather than the build.xml.Eddy Young2015-05-241-135/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maven pom.xml is the new default for organising NetBeans projects, but the structure of the gitblit source folder is unusual because of the placement of the bugtraq source in the tree and Maven does not support this by default. This change introduces Maven Build Helper plugin to integrate the additional source locations. This is preferable to using nbproject\project.xml because 1) there is no need to generate the classpath for that file from build.moxie and 2) the POM generated by build.moxie can be re-used almost as-is, with the following additional configuration. Additional Maven Build Helper (add under build/plugins): <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> <execution> <id>add-source-bugtraq</id> <phase>generate-sources</phase> <goals> <goal>add-source</goal> </goals> <configuration> <sources> <source>src/main/bugtraq</source> </sources> </configuration> </execution> <execution> <id>add-test-source-bugtraq</id> <phase>generate-test-sources</phase> <goals> <goal>add-test-source</goal> </goals> <configuration> <sources> <source>src/test/bugtraq</source> </sources> </configuration> </execution> <execution> <id>add-resources</id> <phase>generate-resources</phase> <goals> <goal>add-resource</goal> </goals> <configuration> <resources> <resource> <directory>src/main/resources</directory> <targetPath>resources</targetPath> <excludes> <exclude>**/junk/**</exclude> </excludes> </resource> </resources> </configuration> </execution> <execution> <id>add-test-resources</id> <phase>generate-test-resources</phase> <goals> <goal>add-test-resource</goal> </goals> <configuration> <resources> <resource> <directory>src/test/resources</directory> <targetPath>resources</targetPath> <excludes> <exclude>**/junk/**</exclude> </excludes> </resource> </resources> </configuration> </execution> </executions> </plugin> Source configuration (add at the end of pom.xml): <properties> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties>
* | | Merged #257 "Bump to JGit 4.0.0"James Moger2015-06-1513-46/+70
|\ \ \
| * | | Bump to JGit 4.0.0Luca Milanesio2015-06-1213-46/+70
| | |/ | |/| | | | | | | | | | JGit 4.0.0 fixes a memory leak but introduces a non-compatible change for closing the RevWalk: before it was release() but now is close()
* | | Merged #256 "allow configuring of internal URLs offered"James Moger2015-06-152-3/+24
|\ \ \ | |/ / |/| |
| * | allow configuring of internal URLs offeredJoel Johnson2015-06-122-3/+24
|/ /
* | Merged #57 "My Tickets needs a repository filter"James Moger2015-05-273-352/+447
|\ \
| * | Applied changes according to code review comments.Eddy Young2015-05-231-15/+10
| | | | | | | | | | | | Removed default "watchedby" filter so that the default now includes "createdby", "responsible", watchedby" and "mention"
| * | Changed the repository filter options to those related to the tickets owned ↵Eddy Young2015-05-221-378/+418
| | | | | | | | | | | | | | | | | | by the user. Also, minor refactoring to avoid code duplication.
| * | Replaced repository name as search criterion with repository idEddy Young2015-05-221-30/+29
| | |
| * | Merge branch 'develop' into ticket-57_developEddy Young2015-05-2211-18/+1023
| |\ \
| * \ \ Implemented ticket-57Eddy Young2015-05-193-10/+71
| |\ \ \
| | * | | Implemented filtering by repository for the My Tickets pageEddy Young2015-05-191-9/+12
| | | | |
| | * | | More changesEddy Young2015-05-192-5/+7
| | | | |
| | * | | Initial changes for ticket-57Eddy Young2015-05-186-15/+71
| | | | | | | | | | | | | | | | | | | | Added tags to .gitignore
| | * | | Merged #245 "Strip line breaks from pasted SSH keys"James Moger2015-03-071-1/+3
| | |\ \ \
* | | \ \ \ Merged #255 "Invalid kerberos patches, works now and with a test."James Moger2015-05-278-2/+175
|\ \ \ \ \ \
| * | | | | | Invalid kerberos patches, works now and with a test.Fabrice Bacchella2015-05-268-2/+175
| | | | | | |
* | | | | | | Merged #254 "Two slight improvement for custom UserService"James Moger2015-05-261-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
* | | | | | Merge pull request #262 from fbacchella/keepsessionJames Moger2015-05-241-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not replace session when authentication type is CONTAINER
| * | | | | | Create web.rewriteSession key for use with tomcat and CASFabrice Bacchella2015-05-231-1/+6
|/ / / / / /
* | | | | | Fix html raw content type servingJames Moger2015-05-221-9/+18
| | | | | |
* | | | | | Merged #253 "Implement configurable tab length support for blob views"James Moger2015-05-2213-35/+71
|\ \ \ \ \ \
| * | | | | | Implement configurable tab length support for blob viewsJames Moger2015-05-2213-35/+71
|/ / / / / /
* | | | | | Merged #252 "Cleanup diff rename output"James Moger2015-05-221-1/+2
|\ \ \ \ \ \
| * | | | | | Cleanup diff rename outputJames Moger2015-05-221-1/+2
|/ / / / / /
* | | | | | Merged #251 "Add onFork and onRename methods to RepositoryLifeCycleListener"James Moger2015-05-224-1/+50
|\ \ \ \ \ \
| * | | | | | Add onFork and onRename methods to RepositoryLifeCycleListenerJames Moger2015-05-224-1/+50
|/ / / / / /
* | | | | | Merged #250 "Improve PAM documentation"James Moger2015-05-221-2/+8
|\ \ \ \ \ \
| * | | | | | Improve PAM documentationJames Moger2015-05-221-2/+8
|/ / / / / /
* | | | | | Merged #249 "Parse X509 DN with LdapName"James Moger2015-05-221-10/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Parse X509 DN with LdapNameJames Moger2015-05-221-10/+12
|/ / / / /
* | | | | Merged #248 "Deny access to /com/* url path"James Moger2015-05-212-0/+75
|\ \ \ \ \
| * | | | | Remove /org/ filteringJames Moger2015-05-212-20/+13
| | | | | |
| * | | | | Deny access to /com and /org folders in GO setupJean-Baptiste Mayer2015-04-143-2/+84
| |/ / / / | | | | | | | | | | | | | | | | | | | | Added a servlet to serve "Access Denied" Added conditional mapping of /com and /org folders in the web setup
* | | | | Merged #247 "Add Kerberos5/GSS authentication to ssh"James Moger2015-05-215-1/+90
|\ \ \ \ \
| * | | | | Adding Kerberos5/GSS authentication to sshFabrice Bacchella2015-05-045-1/+90
| |/ / / / | | | | | | | | | | | | | | | Adding the possibility to define authentication method order for ssh
* | | | | Merged #246 "Option to extract user metadata from container HTTP session"James Moger2015-05-213-17/+722
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | A patch that allows to extract a new user informations from the HTTP sessionFabrice Bacchella2015-05-153-17/+722
| |/ / / | | | | | | | | | | | | if the webapp container can fill it.
* | | | Added nbproject/private folder to .gitignoreEddy Young2015-05-201-0/+1
| | | |
* | | | Removed private\ folder which is specific to each NetBeans user sessionEddy Young2015-05-201-30/+0
| | | |
* | | | Add support for NetBeans projectEddy Young2015-05-202-0/+165
|/ / /
* | | Merge pull request #250 from StephenKing/doc-rpcJames Moger2015-03-241-5/+5
|\ \ \ | | | | | | | | Docs: Fix RPC URL
| * | | Docs: Fix RPC URLSteffen Gebert2015-03-241-5/+5
|/ / / | | | | | | | | | | | | The RPC URL should be `/rpc/?` and not `/rpc?` according to https://groups.google.com/d/msg/gitblit/Ajp2gR3B2bM/AXg6wIf21eIJ