Merge branch 'retry_fix_#838' of https://github.com/officer/gitbucket into officer-retry_fix_#838 ...

# Conflicts:
#	src/main/scala/gitbucket/core/view/LinkConverter.scala

(refs #831)url encode filename in the redirect path

Update version to 3.6.0

BugFix and improvement for pull request

Fix merge guide to display ssh url

Improve issue and pull request creation form

Updated to fix truncated name in JSON: watchers_coun ...

The correct field in the JSON should be `watchers_count` rather
than the truncated version `watchers_coun`.

Improve issue creation form

(refs #871)Make link for @mention which contains dot

list installed plugins in the system administration menu

Fix making bad link from certain references.

GitBucket 3.5.0 release

(refs #810)Some fix about pull request

Merge branch 'implement-668' of https://github.com/beraboris/gitbucket into beraboris-implement-668

(refs #810)Display Compare (or Pull Request) button for the default branch of the forked repository

Merge branch 'sapk-master'

(refs #409)Fix header anchor name in Markdown

(refs #409)Fix Markdown style

Merge branch 'email-sender' of https://github.com/uli-heller/gitbucket into uli-heller-email-sender

Fix duplicated Content-Type

(refs #830)Bump pegdown to 1.5.0 and support strike syntax

(refs #811)Remove html tags from title of atom feed

(refs #812)Apply GitRepositoryFilter to SSH access too

(refs #812)Prepend '/' to repository name

(refs #812)SSH support for plug-in served git repository

(refs #812)Add GitRepositoryFilter for authentication

(refs #812)Add new extension point to serve Git repository by plug-in

Fixed url generated by pull request/compare button ...

The `:` character was getting escaped leading to an ugly url. This is
different from the urls generated when editing the branches in a pull
request. In that case the url did not have `:` escaped.

Pullreqs in forks now use upstream master as origin ...

This implements #668.

(refs #802)Allow '+' in repository name

(refs #808)Add collaborators when fork repository by group

Fix behavior when enableAnchor is false

Add option to disable anchor for headline in markdown

Improve declarative Plugin definition interface

Use '{loginName} {fromAddress}' for the from field within the notification emails

Fix warnings

GitBucket 3.4 release

(refs #788)Fix NotFound in comparing with sibling repository

(refs #780)Not add an issue refer comment if it already exists

(refs #751)Fix issue reference in verbatim node

Remove empty lines

Merge pull request #768 from Mura-Mi/avoid-npe-masterless ...

Avoid NPE when master branch does not exist

(refs #775)Move isRenderable() to helpers from PluginRepository

(refs #775)Add new extension point to add markup render

Provides declarative style plug-in definition.

Bump version to 3.3

Avoid NPE when master branch does not exist

(refs #763)Don't remove disabled user's data and repositories.

Merge branch 'featuer/image-on-diff' of https://github.com/team-lab/gitbucket into team-lab-featuer/image-on-diff ...

# Conflicts:
#	src/main/webapp/assets/common/js/gitbucket.js

Merge branch 'feature/blame' of https://github.com/team-lab/gitbucket into team-lab-feature/blame ...

# Conflicts:
#	src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
#	src/main/webapp/assets/common/css/gitbucket.css

Merge pull request #696 from team-lab/feature/file-finder ...

add file finder

fix login value.

(refs #738)Set "application/octet-stream" as Content-Type to avoid automatic charset detection for text files in Scalatra

add image diff

Merge pull request #718 from team-lab/feature/api-add-issue-urls ...

Feature/api add issue urls

Dispose ObjectLoader certainty

Define Version 3.2

(refs #660)Register Scalatra error callback to rollback transaction

(refs #534)Allow to download large file

(refs #707)Exclude disabled users from completion list

(refs #441)Fix delete condition

(refs #441)Add limit of activity log configuration

Separate AutoUpdate from InitializeListener

fix test hook error

Merge pull request #723 from team-lab/fix/#721-npe-getFileList-multi-origin-subfolder ...

(refs #721)NullPointerException on getFileList

(refs #721)NullPointerException on getFileList if branch has multi-origin and get sub-folder file list

(refs #715)Escape $ in replacement string

add html_url on api issue-comment

add html_url and comments_url on api issue

(refs #713)Fix anchor to headline in Wiki

Merge pull request #697 from banjun/fix-basicauth-for-public-repo ...

let non-anonymous user read access to public repos with basic auth

Revert "Fix basic auth read when anon access disabled" ...

This reverts commit 5f3d624.

Merge pull request #702 from marklacroix/no-anon-basic-auth-read ...

Fix basic auth read when anon access disabled

Fix db connection error in dev mode ...

Changes to close the no longer needed DB connections.

Merge pull request #699 from rlazoti/fix-notifier ...

Fix issue notifications

Merge pull request #701 from team-lab/fix/api-issue-user ...

fix some api user is invalid, and add content-type on webhook

Fix basic auth read when anon access disabled ...

Basic authentication fails when not updating a public repository
with the "Disable Anonymous Access" option enabled

fix some api user is invalid ...

issue.userName -> issue.openedUserName
  issueComment.userName -> issueComment.commentedUserName

fix issue notifications

let non-anonymous user read access to public repos with basic auth

add file finder

Add SystemSettings to Plugin arguments

Merge pull request #690 from noc06140728/fix-basic-auth ...

Allow a password that contains colons

Merge branch 'feature/#422-compare-link-near-branch-selector' of https://github.com/team-lab/gitbucket into team-lab-feature/#422-compare-link-near-branch-selector ...

Conflicts:
	src/main/twirl/gitbucket/core/repo/files.scala.html

Merge pull request #694 from team-lab/feature/#536-Commits-view-on-directory ...

Browse history for directory

(#536) Browse commits for directory

Merge pull request #681 from team-lab/feature/improve-file-list-performance ...

Feature/improve file list performance

Merge pull request #691 from team-lab/fix/#684-api-contextpath-support ...

fix/api context-path support

(ref #684)fix api context-path support

Allow a password that contains colons ...

Allow a password that contains colons in the basic autentication.

(refs #442)show compare/pull request link near branch link.

Fix compilation error

Pass ServletContext to Plugin

Performance Improve for getFileList

Merge branch 'master' into feature/blame ...

Conflicts:
	src/main/scala/gitbucket/core/util/JGitUtil.scala

follow rename

(refs #664)Normalize line separator and empty line

(refs #671)Use servletPath instead of requestURI

Merge remote-tracking branch 'origin/api-support'

Merge pull request #656 from jparound30/feature_rename_detection ...

(refs #641) Enable rename detection

Fix test code package name

Move api package to new rule

Merge remote-tracking branch 'origin/master' into api-support ...

Conflicts:
	src/main/scala/ScalatraBootstrap.scala
	src/main/scala/gitbucket/core/controller/AccountController.scala
	src/main/scala/gitbucket/core/controller/ControllerBase.scala
	src/main/scala/gitbucket/core/controller/IssuesController.scala
	src/main/scala/gitbucket/core/controller/PullRequestsController.scala
	src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
	src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
	src/main/scala/gitbucket/core/model/Profile.scala
	src/main/scala/gitbucket/core/service/PullRequestService.scala
	src/main/scala/gitbucket/core/service/WebHookService.scala
	src/main/scala/gitbucket/core/servlet/InitializeListener.scala
	src/main/scala/gitbucket/core/view/helpers.scala
	src/main/twirl/gitbucket/core/pulls/conversation.scala.html
	src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
	src/main/twirl/issues/listparts.scala.html

(refs #653)Sort tags by date

(refs #641) Enable rename detection

(refs #644)Fix authentication for Git access via HTTP

(refs #645)Fix disableByNotYourSelf validation

resolve gravatar on blame

fix javascript getter for plug-in system

fix parent. only path exists

add blame

Add Version 3.0 to versions

Fix Profile structure

Temporary fix instantiation error

Change package name