MergeServiceSpec more likely to succeed

Fix repository creation error

Fix compilation error in testcase

(refs #970)Display permission change

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

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

Fix compilation error caused by JGit update

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

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 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

(refs #1018)Move to xsbt-web-plugin from scalatra-sbt

Upgrade c3p0 and tweak default config to avoid Tomcat issues ...

Adds a standard typesafe-config reference.conf file that sets c3p0
config to prevents Tomcat memory leaks on hot-redeploy/shutdown.

See
   http://www.mchange.com/projects/c3p0/#configuring_to_avoid_memory_leaks_on_redeploy
   http://www.mchange.com/projects/c3p0/#tomcat-specific

This new config can be overridden in an application.conf or
c3p0.properties file.

( See http://www.mchange.com/projects/c3p0/#configuration_precedence )

Updates c3p0 version to c3p0-0.9.5.2, which fixes that leads to
unnecessary String allocation when logging via slf4j.

Update logging configuration

Fix global header style

Fix styles in file editing form in the repository viewer

(refs #1007)Fix max length constraint for repository owner and name at the repository creation form

(refs #1005)Fix typo

Merge pull request #1009 from team-lab/fix/webhook-push-pusher ...

(fixes #1008) pusher of webhook push event is not same as github's it

support legacy route of List Statuses for a specific Ref api