Merge pull request #275 from mrjoel/mrjoel-cookiesession3.0

use JEE 3.0 to allow cookie session tracking

use JEE 3.0 to allow cookie session tracking

Update to JGit 4.0.1

Merged #259 "Allow custom host & port specification for advertised SSH urls"

Renamed ssh.Display(Host|Port) to ssh.Advertised(Host|Port)

Added git.sshDisplay{Port|Host} to hide port forward.

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"

Revised AvatarGenerator to be injectable

First draft for a customized avatar image

Merge pull request #263 from jeyoung/netbeans_support

Reworked NetBeans project to be based on the pom.xml rather than the …

Merged #257 "Bump to JGit 4.0.0"

Merged #256 "allow configuring of internal URLs offered"

allow configuring of internal URLs offered

Bump to JGit 4.0.0

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 #57 "My Tickets needs a repository filter"

Merged #255 "Invalid kerberos patches, works now and with a test."

Invalid kerberos patches, works now and with a test.

Merged #254 "Two slight improvement for custom UserService"

Two slight improvement for custom UserService:
- 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/keepsession

Do not replace session when authentication type is CONTAINER

Reworked NetBeans project to be based on the pom.xml rather than the build.xml.

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>

Create web.rewriteSession key for use with tomcat  and CAS

Applied changes according to code review comments.

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 by the user.

Also, minor refactoring to avoid code duplication.

Fix html raw content type serving

Merged #253 "Implement configurable tab length support for blob views"

Implement configurable tab length support for blob views

Merged #252 "Cleanup diff rename output"

Cleanup diff rename output

Merged #251 "Add onFork and onRename methods to RepositoryLifeCycleListener"

Add onFork and onRename methods to RepositoryLifeCycleListener

Merged #250 "Improve PAM documentation"

Improve PAM documentation

Merged #249 "Parse X509 DN with LdapName"

Parse X509 DN with LdapName

Replaced repository name as search criterion with repository id

Merge branch 'develop' into ticket-57_develop

Merged #248 "Deny access to /com/* url path"

Remove /org/ filtering

Merged #247 "Add Kerberos5/GSS authentication to ssh"

Merged #246 "Option to extract user metadata from container HTTP session"

Added nbproject/private folder to .gitignore

Removed private\ folder which is specific to each NetBeans user session

Add support for NetBeans project

Implemented ticket-57

Implemented filtering by repository for the My Tickets page

More changes

Initial changes for ticket-57

Added tags to .gitignore

A patch that allows to extract a new user informations from the HTTP session
if the webapp container can fill it.

Adding Kerberos5/GSS authentication to ssh
Adding the possibility to define authentication method order for ssh

Deny access to /com and /org folders in GO setup

Added a servlet to serve "Access Denied"
Added conditional mapping of /com and /org folders in the web setup

Merge pull request #250 from StephenKing/doc-rpc

Docs: Fix RPC URL

Docs: Fix RPC URL

The RPC URL should be `/rpc/?` and not `/rpc?` according to
https://groups.google.com/d/msg/gitblit/Ajp2gR3B2bM/AXg6wIf21eIJ

Update Jetty to 9.2.10

Update to SSHD 0.14

Merged #233 "Ignore whitespace in diff viewer"

Add a checkbox to control whitespace diff preference on the compare page

Add links to commit diff and blob diff pages to toggle whitespace setting

Expose the DiffComparator choice as an url parameter (?w=1)

Add DiffComparator argument to all DiffUtils calls, default to ignore all whitespace

Restore tab conversion to 4 spaces in HTML diff output

Update JGit to 3.7.0

Merged #225 "The Delete button for repositories is placed rather unfortunately"

Move the Delete Repository button to a separate "administration" tab

Merged #245 "Strip line breaks from pasted SSH keys"

Merge branch 'ticket/245' into develop

Strip line breaks from pasted SSH keys

Merged #244 "Implement user/team difference detection"

Merge branch 'ticket/244' into develop

Minor refactoring of user/team checksumming

Setting up a checksum on user and team instances to lower connection delay

Merged #243 "Allow Forks is not saved on repository edit"

Fix failure to save Allow Forks repository setting

Update SLF4j, JGit, Groovy, BouncyCastle, Mina, Gson, Freemarker, libpam4j, args4j, Jedis, waffle-jna, Unboundid

Merged #242 "issue-545: Enforce repository permissions in patch page"

Merge branch 'ticket/242' into develop

issue-545: Enforce repository permissions in patch page

Merged #241 "issue-527: Synchronize changes from upstream Bugtraq"

Merge branch 'ticket/241' into develop

issue-527: Synchronize changes from upstream Bugtraq

Merged #240 "Fix spelling mistake"

Fix spelling mistake

Merged #239 "Remote Leakage Of Shared Buffers In Jetty Web Server [CVE-2015-2080]"

Merge branch 'ticket/239' into develop

issue-566: Udpate to Jetty 9.2.9 for CVE-2015-2080

Merged #238 "issue 564: enable ticket page update on tomcat with redirects"

Merge branch 'ticket/238' into develop

issue 564: enable ticket page update on tomcat with redirects

issue 564: fix imports

issue 564

Fix spelling mistake

Merged #237 "Add 'UTF8' encoding alias"

Merge branch 'ticket/237' into develop

Add 'UTF8' encoding alias

Merged #234 "#230 - Improve empty folder navigation."

#230 - Improve empty folder navigation.

Empty folders are automatically skipped when browsing repository tree  (similar to github "folder jumping" feature).

Merge pull request #240 from steveno/develop

GitBlit no longer uses Google charts

GitBlit no longer uses Google charts

Merged #228 "Add support for configurable HTTP proxy host/port in PluginManager.java"

Add support for specifying the `Proxy-Authorization` header for the PluginManager

Merged #227 "Small adjustments to allow integration with Gerrit Code Review"

Merged #226 "Added a new property: web.displayUserPanel"