Merge pull request #1026 from team-lab/fix/test-merge-service-more-likely-to-succeed ...

MergeServiceSpec more likely to succeed

Merge pull request #1024 from team-lab/fix/test-specs2-junit ...

fix test ( add specs2-junit )

MergeServiceSpec more likely to succeed

fix 'cannot create a JUnit XML printer. Please check that specs2-junit.jar is on the classpath'

Fix repository creation error

Fix compilation error in testcase

(refs #970)Display permission change

Merge branch 'viliamjr-wiki-sidebar'

Merge branch 'wiki-sidebar' of https://github.com/viliamjr/gitbucket into viliamjr-wiki-sidebar ...

# Conflicts:
#	src/main/twirl/gitbucket/core/wiki/page.scala.html

Deploy assembly jar to snapshot repository if version ends with "-SNAPSHOT"

Fix compilation error caused by JGit update

Update depended libraries

Update version to 3.11.0-SNAPSHOT

Fix dropdown bug

Remove file appender

Upgrade scalatra-forms to 1.0.0 that supports Scalatra 2.4.0

(refs #738)Revert content type detection ...

because Scalatra automatic charset detection issue has been fixed in Scalatra 2.4.0.
https://github.com/scalatra/scalatra/pull/500

(refs #815)Upgrade Scalatra to 2.4.0

3.10 release

Bump up H2 to 1.4.190

Rename logback-test.xml to logback-dev.xml

(refs #990)Provides path for raw contents instead of ?raw=true

Adjust format

Merge pull request #1017 from swaldman/minor-c3p0-tweaks ...

Upgrade c3p0 and tweak default config to avoid Tomcat issues

Merge pull request #1020 from P1tt187/sshd-RSA-keyprovider ...

update sshd dependency, rsa keyprovider as default

(refs #1004)Fix edit webhook link url

Fix branch control dropdown

update version

update sshd dependency ...

migrate to new sshd api
change the default key provider algorithm to RSA

Don't break lines in Wiki or markdown files on the repository viewer