# Conflicts:
#	build.sbt
#	src/main/scala/ScalatraBootstrap.scala
#	src/main/scala/gitbucket/core/GitBucketCoreModule.scala
#	src/main/scala/gitbucket/core/controller/FileUploadController.scala
#	src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
#	src/main/scala/gitbucket/core/service/RepositoryService.scala
#	src/main/twirl/gitbucket/core/menu.scala.html

Supports following services:
- GitBucket (need to set the base url at the system settings)
- GitHub
- BitBucket
- GitLab.com
If a repository url doesn't match above services, generate a link to the git repository as before.

Replace H2 console

Add a pulldown menu to choose the merge strategy

if the repository doesn't have a parent repository.

because users who can access the forked repository should see the
original repositories and other forked repositories basically.

Bump to Scalatra 2.6.0

Fix #1513

Use account.fullName instead of userName for Web UI edit, Wiki uploads.

Add additional system paths to reserved names

Apply commit hook to online file editing

Allow anonymous access to github style git url redirect. fix #1701

Modified to pass assignee from outside of model instead.

# Conflicts:
#	src/main/scala/gitbucket/core/controller/ApiController.scala

Handle errors to show errors prettify and logging it.

# Conflicts:
#	src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
#	src/main/scala/gitbucket/core/service/SystemSettingsService.scala
#	src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala

SystemSettingsController calls Mailer.send directly. fix it too.

tooltip across the app.

Add hook for issue and pull request

made maxFileSize in FileUploadController configurable

Fix #1525 move attached directory when rename/transfer repo.

when archive downloading with sha1, even if supplied part of sha1,
GH/GHE gives a filename with full(long) sha1.

This patch make GitBucket to be compatible with GH/GHE behaviour.

You can check that difference by following url.
I upload same repo as in GitHuB to GitBucket demo site.
 
GitHub:  
https://github.com/MunGell/awesome-for-beginners/archive/fc7d067.tar.gz
GitBucket:
http://gitbucket.herokuapp.com/root/awesome-for-beginners/archive/fc7d067.tar.gz

GH returns,
awesome-for-beginners-fc7d067.tar.gz
Otherwise GitBucket returns,
awesome-for-beginners-fc7d067.tar.gz

archive naming rule modification to have comatibility with GitHub/GitHubEnerprise.

When downloding archive file,
GH/GHE use "-" as escape character for "/" in brach name.

some refactoring

Fix #1516 send noimage.png if user is removed.

It makes possible to hook repository creation, deletion, renaming, transferring and forking by plug-ins.

Added automatic rescaling to avatar images (Fixes #835)

Issue and PR template per repository

Fixes #1410

add api 'create an issue'

Upgrade JGIT to jgit: 4.6.0.201612231935-r

cf. https://developer.github.com/v3/issues/#get-a-single-issue

(refs #1348)Keep pull request comment if new commits are pushed

cf. https://developer.github.com/v3/repos/contents/#custom-media-types

# Conflicts:
#	src/main/resources/update/3_13.sql
#	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala

# Conflicts:
#	src/main/scala/gitbucket/core/service/WebHookService.scala
#	src/main/twirl/gitbucket/core/settings/edithooks.scala.html

Separate API controller to improve routing performance

add X-Hub-Signature security to wekhooks

Extend API to allow CRUD labels

Set Content-Type to json for /api/v3/* (fix #1056)

Fixed invalid json format
* List all labels for this repository

Fixed wrong http status
* 200 -> 204

Add Labels API
    * List all labels for this repository
    * Get a single label
    * Create a label
    * Update a label
    * Delete a label

    Reject duplicated label name

    Add test case for LabelsService

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

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

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

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

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.

And use getWikiPage to avoid code repetition.

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.

Support uploading PDF files

Feature/add properties for webhook push

Creating repositories over API

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.

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

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

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

add file finder

Feature/api add issue urls

Fix issue notifications

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

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

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