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

(refs #1031)Fix issue link processing in Markdown

Fix Markdown preview style ...

However styles in markdown-body affect tab. So there are invalid margin at the top of the tab.

add test

move MergeStatus to service

use common mapper

fix typo

remove blank line from basic-template

use real database

remove println(for debug)

update button

add protected-branch feature on pull-request page ...

* show commit-status if context is require status checks to pass.
  * disable merge if new commit-id has not `commit-status` ok on `Status-checkes`.
  * if some status includes required is not success, merge button is disabled.
  * if any required status is success, and some status not includes required, merge button is active, but button color is white.
  * if any required status is success, merge button is active, and button color is green.

Protected mark(octicon-shield) on Branches page

Readonly on online-editor

add protected branch list on branch setting page.

Add git proection api and form

create `repository setting branches` page and move default branch setting to there.

Fix repository creation error

(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

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

3.10 release

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

Adjust format

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

update sshd dependency, rsa keyprovider as default

(refs #1004)Fix edit webhook link url

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

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

A simple wiki page (markdown file "_Footer.md") is used as footer for the wiki. ...

Github specification:
https://help.github.com/articles/creating-a-footer/

- the footer is rendered below the wiki page content.
- a direct link to edit the footer.

(refs #987)Remove user related data when users delete themselves

Fix typo in comment

Merge branch 'master' into feature/webhook-review-comment

Upgrade scalatra-forms to 0.2.0 to solve performance issue

Remove the getWikiSideBar service ...

And use getWikiPage to avoid code repetition.

Fix webhook editing presentation and performance issue

A sidebar page for the wiki ...

A simple wiki page (markdown file "_Sidebar.md") is used as a sidebar menu for the wiki.

Github specification:
https://help.github.com/articles/creating-a-sidebar/

- the sidebar is rendered below the pages index.
- if you click on page index "counter" you can collapse or expand the
  page list.

A service to get the wiki sidebar page ...

- getWikiSideBar: a new service to get the wiki sidebar file "_Sidebar.md".
- getFileContent: must ignore MD files which starts with "_".

Merge branch 'master' into feature/webhook-review-comment

fix lost web hook events on repository renamed.

Merge pull request #973 from gitbucket/commit_comment_count ...

Count COMMIT_COMMENT as issue comment

Drop PULL_REQUEST column from COMMIT_COMMENT table

add webhook pull-request-review-comment

(refs #976)Enable GFM line breaks

Count COMMIT_COMMENT as issue comment

update migration version to 3.9 from 3.8

Merge branch 'master' into feature/webhook-scope

Update version number to 3.8

Merge pull request #939 from nus/feature/upload-pdf ...

Support uploading PDF files

Merge pull request #925 from team-lab/feature/add-compare-link-for-webhook-push ...

Feature/add properties for webhook push

Merge pull request #960 from arteria/master ...

Creating repositories over API

Adjust whitespace

Merge branch 'master' of github.com:gitbucket/gitbucket

Update PullRequestsController.scala ...

when the forked repository is the original repository(forkedRepository.repository.originRepositoryName&originUserName is None),then 404 will occur,so add the if to solve it.

Change group repository creation API endpoint to /orgs/:org/repos

Extend API to allow creating repositories

Write a Content-Disposition header for attach files.

Add document file formats for upload ...

The following extension is added.
- .docx
- .pptx
- .txt
- .xlsx

Fix order of updating pull request when repository is renamed

(refs #945)Remove ?raw=true from url other than images

Remove unnecessary TODO

(refs #946)Insert refer comment when pull request is created

(refs #947)Fix referenced link from pull request

Merge pull request #944 from lefou/t943-url-in-repo-desc ...

Detect links and render them as HTML links in repo description

Refined regex and removed explicit TLDs ...

Also made regex val private.

Detect links and render them as HTML links in repo description

(refs #907)Omit diffs if updated files are 100 over

Merge branch 'master' of https://github.com/takezoe/gitbucket

(refs #907)Omit the compare view for large diffs

Merge pull request #940 from team-lab/fix/933-download-large-file ...

(ref #933) fix/Unable to download large file

fix return value

feature/can select webhook events

Merge pull request #905 from kanmi/ssh-host-key ...

Specify option to generate an RSA host key

(ref #933) fix/Unable to download large file (fix method name)

(ref #933) fix/Unable to download large file

Change a path for uploading a file

Enable to upload a PDF file

remove ApiPushCommit class (merge to ApiCommit)

fix `repository.url` on webhook `push` payload

add `head_commit` on webhook push payload

add `compare`, `after` and `before` property on webhook push payload

Fix url encoding to encode whitespace to %20

Merge pull request #919 from team-lab/fix-push-commit-url ...

fix commit url in webhook `push` event.

Merge pull request #921 from team-lab/fix-#700-update-pr-on-web-ui ...

(refs #700)web ui merge does not update pull request that already exist

(refs #920) Remove `IssueOrPullRequest`. it is too much for this purpose

(refs #700)web ui merge does not update pull request that already exist

api url is only `issues`

fix pull-request url on webhook payload

The ApiCommit should be export url and html values in json.

fix commit url in push webhook.

(refs #917)Fix incorrent HTML escape

(refs #915)Fixup

Merge branch 'master' of https://github.com/snowgooseyk/gitbucket into snowgooseyk-master

Sanitize in markdown

Fix ArrayIndexOutOfBoundsException

(refs #823)Enable file finder for branches which contain /

(refs #896)Add description and migration for separation of notification and SMTP configuration

Merge branch 'issue-893' of https://github.com/McFoggy/gitbucket into McFoggy-issue-893

(refs #913)Remove Java8 dependency

Enable task list after update issue

Fix Markdown testcase

Refactoring

Restore header anchor

Restore task-list support

Bump markedj to 1.0.1

Fix links

Fix code and ordered list style

Switch markdown processor to markedj from pegdown

Specify option to generate an RSA key

Fix issue link in Markdown

Merge branch 'SupportCloneInDesktop' of https://github.com/hikaruworld/gitbucket into hikaruworld-SupportCloneInDesktop

(refs #895)Fix generate anchor option in Wiki

split SMTP & notification, fixes #893

Exclude group name from issue / pull request assignees

Fix NullPointerException for non-existent branches

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