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

(refs #864)Fix blame

Fix broken blame

Change a limit of initial amount of the repositories list

Update version to 3.6.0

BugFix and improvement for pull request

Add show more link for repositories and wiki pages

Fix merge checking

Fix presentation of commit list in the pull request detail view

Merge pull request #886 from noc06140728/fix-octicon ...

Replace some icon to octicon

Fix merge guide to display ssh url

Replace some icon to octicon ...

- replace some of the non-octicon to octicon.
- adjust the color of octicon on the button.

modified icon is as follows.

- .icon-home          -> .octicon-home
- .icon-time          -> .octicon-clock
- .icon-ok            -> .octicon-check
- .icon-lock          -> .octicon-lock
- .icon-envelope      -> .octicon-mail
- .icon-pencil        -> .octicon-pencil
- .icon-remove-circle -> .octicon-x
- .icon-check         -> .octicon-clippy
- .icon-calendar      -> .octicon-calendar
- .icon-cog           -> .octicon-gear
- .icon-th-list       -> .octicon-list-unordered
- .icon-trash         -> .octicon-trashcan
- .icon-arrow-right   -> .octicon-arrow-right
- .icon-retweet       -> .octicon-git-compare
- .icon-comment       -> .octicon-comment

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

Merge pull request #882 from garygreen/shorten-commit-message ...

File listing and sidebar display improvements

Update merge guide

File listing and sidebar display improvements

Merge branch 'link-width' of https://github.com/garygreen/gitbucket into garygreen-link-width

Improve the pull request creation form

Remove unused code

Improve comparing view

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

Improve th background color

Merge pull request #880 from garygreen/issues-gui ...

Improved design of issue

(refs #878)Hide the Delete button for other than the head of branch

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

Improved design of issue

Update main.scala.html ...

fix header plus dropdown menu display bug in safari and add 'Your profile' in user dropdown menu