Optimize Get-Contents API

02a0cfa0a6/io/src/main/scala/sbt/io/IO.scala (L611-L630)

```
/home/runner/work/gitbucket/gitbucket/build.sbt:205: warning: method jar in object IO is deprecated (since 1.3.2): Please specify whether to use a static timestamp
  IO jar (contentMappings.map { case (file, path) => (file, path.toString) }, outputFile, manifest)
     ^
```

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+end_of_line = lf
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.java]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4

.github/CODEOWNERS

@@ -0,0 +1,4 @@
+* @takezoe
+
+build.sbt @xuwei-k
+project/* @xuwei-k

.github/CONTRIBUTING.md

@@ -1,7 +1,6 @@
-# Guideline for Issues
+# The guidelines for contributing
 
-- At first, See [FAQ](https://github.com/gitbucket/gitbucket/wiki/FAQ) and check issues whether there is a same question or request in the past.
-- If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
-- We can also support in Japaneses other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
-- Write an issue in English. At least, write subject in English.
-- First priority of GitBucket is easy installation and reproduce GitHub behavior, so we might reject if your request is against it.
+- At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues and pull requests whether there is a same request in the past.
+- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before starting your work.
+- You can edit the GitBucket documentation on Wiki if you have a GitHub account. When you find any mistakes or lacks in the documentation, please update it directly.
+- All your contributions are handled as [Apache Software License, Version 2.0](https://github.com/gitbucket/gitbucket/blob/master/LICENSE). When you create a pull request or update the documentation, we assume you agreed this clause.

.github/ISSUE_TEMPLATE.md

@@ -1,19 +1,18 @@
-### Before submitting an issue to Gitbucket I have first:
+### Before submitting an issue to GitBucket I have first:
 
-- [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
-- [] searched for similar already existing issue
-- [] read the documentation and [wiki](https://github.com/gitbucket/gitbucket/wiki) 
+- [ ] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
+- [ ] searched for similar already existing issue
+- [ ] read the documentation and [wiki](https://github.com/gitbucket/gitbucket/wiki)
 
 *(if you have performed all the above, remove the paragraph and continue describing the issue with template below)*
 
 ## Issue
 **Impacted version**: xxxx
 
-**Deployment mode**: *explain here how you use gitbucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
+**Deployment mode**: *explain here how you use GitBucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
 
 **Problem description**:
-- *be as explicit has you can*
+- *be as explicit as you can*
 - *describe the problem and its symptoms*
 - *explain how to reproduce*
 - *attach whatever information that can help understanding the context (screen capture, log files)*
-- *do your best to use a correct english (re-read yourself)*

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,8 @@
-### Before submitting a pull-request to Gitbucket I have first:
+### Before submitting a pull-request to GitBucket I have first:
 
-- [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
-- [] rebased my branch over master
-- [] verified that project is compiling
-- [] verified that tests are passing
-- [] squashed my commits as appropriate *(keep several commits if it is relevant to understand the PR)*
-- [] [marked as closed](https://help.github.com/articles/closing-issues-via-commit-messages/) all issue ID that this PR should correct
+- [ ] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/.github/CONTRIBUTING.md)
+- [ ] rebased my branch over master
+- [ ] verified that project is compiling
+- [ ] verified that tests are passing
+- [ ] squashed my commits as appropriate *(keep several commits if it is relevant to understand the PR)*
+- [ ] [marked as closed using commit message](https://help.github.com/articles/closing-issues-via-commit-messages/) all issue ID that this PR should correct

.github/SUPPORT.md

@@ -0,0 +1,5 @@
+# The support guidelines
+
+- At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
+- If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
+- Write issues in English if it's possible. It enables many of contributors to help you.

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -0,0 +1,39 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      matrix:
+        java: [8, 11, 17]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Cache
+      uses: actions/cache@v2.1.6
+      env:
+        cache-name: cache-sbt-libs
+      with:
+        path: |
+          ~/.ivy2/cache
+          ~/.sbt
+          ~/.cache/coursier/v1
+        key: build-${{ env.cache-name }}-${{ hashFiles('build.sbt') }}
+    - name: Set up JDK
+      uses: actions/setup-java@v2
+      with:
+        java-version: ${{ matrix.java }}
+        distribution: adopt
+    - name: Run tests
+      run: sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck test
+    - name: Scala 3
+      run: sbt '++ 3.0.1!' update # TODO
+    - name: Build executable
+      run: sbt executable
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: gitbucket-java${{ matrix.java }}-${{ github.sha }}
+        path: ./target/executable/gitbucket.*

.gitignore

@@ -10,14 +10,27 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+.bsp/
 
 # Scala-IDE specific
 .scala_dependencies
 .classpath
 .project
 .cache
+.cache-main
+.cache-tests
 .settings
 
 # IntelliJ specific
 .idea/
 .idea_modules/
+*.iml
+
+# Metals specific
+.metals
+.bloop
+**/metals.sbt
+
+# Visual Studio Code specific
+.vscode
+

.scala-steward.conf

@@ -0,0 +1,7 @@
+updates.limit = 3
+
+updates.includeScala = true
+
+updates.pin = [
+  { groupId = "org.eclipse.jetty", version = "9." }
+]

.scalafmt.conf

@@ -0,0 +1,12 @@
+version = "1.5.1"
+project.git = true
+
+maxColumn = 120
+docstrings = JavaDoc
+
+align.tokens = ["%", "%%", {code = "=>", owner = "Case"}]
+align.openParenCallSite = false
+align.openParenDefnSite = false
+continuationIndent.callSite = 2
+continuationIndent.defnSite = 2
+danglingParentheses = true

.travis.yml

@@ -1,11 +0,0 @@
-language: scala
-sudo: true
-script:
-  - sbt test
-jdk:
-  - oraclejdk8
-before_script:
-  - sudo apt-get install libaio1
-  - sudo /etc/init.d/mysql stop
-  - sudo /etc/init.d/postgresql stop
-

CHANGELOG.md

@@ -0,0 +1,617 @@
+# Changelog
+All changes to the project will be documented in this file.
+
+### 4.36.2 - 16 Aug 2021
+- Escape user name in avatar image tag
+
+### 4.36.1 - 22 Jul 2021
+- Bump gitbucket-gist-plugin to 4.21.0
+
+### 4.36.0 - 17 Jul 2021
+- Tag selector in the repository viewer
+- Link issues/pull requests of other repositories
+- Files and lines can be linked in the diff view
+- Option to disable XSS protection
+
+### 4.35.3 - 14 Jan 2021
+- Fix a bug that Wiki page cannot be deleted
+- Fix a deployment issue on Tomcat
+
+### 4.35.2 - 30 Dec 2020
+- Upgrade gitbucket-notifications-plugin to 1.10.0
+- Upgrade oauth2-oidc-sdk to 8.29.1 to solve dependency issue
+
+### 4.35.1 - 29 Dec 2020
+- Fix database migration issue which happens if webhook is configured
+- Call push webhook when pull request is merged
+- Show commit status at commits tab of pull request
+
+### 4.35.0 - 25 Dec 2020
+- Editor and source viewer color theme
+- Auto completion for issues and pull requests
+- Upload image from clipboard
+- Close multiple issues by commit comment
+- Create pull request from online editor
+- Milestone overview
+- Commit status at various places
+- WebAPI coverage improvements
+
+## 4.34.0 - 26 Jul 2020
+- Enhancement admin settings UI
+   - File upload settings
+   - Restrict repository operations
+   - User-defined CSS
+   - Limit the repository list in the sidebar
+- Improve MariaDB support
+- Improve activity logging
+- CLI option to persist session on disk in the standalone mode
+- Web API updates
+  - Add [list commits API](https://developer.github.com/v3/repos/commits/#list-commits)
+- Bundled plugins updates
+  - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin) 4.18.0 -> 4.19.0
+  - [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin) 1.8.0 -> 1.9.0
+
+## 4.33.0 - 31 Dec 2019
+- All CLI options are configurable by environment variables
+- Folding pull request files
+- WebHook security options
+- Add assignee and assignees properties to some Web APIs' response
+
+## 4.32.0 - 7 Aug 2019
+- Bump to Scala 2.13.0 and Scalatra 2.7.0
+- Draft pull request
+- Drop network installation of plugins
+- Compare view works for commit id
+- Apply default priority to pull requests
+- Focus title after clicking issue / pull request edit button
+
+## 4.31.2 - 7 Apr 2019
+- Bug and security fix
+
+## 4.31.1 - 17 Mar 2019
+- Bug fix
+
+## 4.31.0 - 17 Mar 2019
+- Docker support in CI plugin
+- Verify GPG key signed commit
+- OAuth2 Token (sent as a parameter) authentication support and new APIs in Web API
+- OGP (Open Graph protocol) support
+- Username completion with avatars
+
+## 4.30.1 - 22 Dec 2018
+- Bug fix for several WebHooks and Web API
+
+## 4.30.0 - 15 Dec 2018
+- Automatic ChangeLog Summary generation for new Releases
+- A lot of GitBucket Web API updates to increase compatibility with the GitHub API.
+- Display of checkboxes in Markdown files in Git repositories
+- A new extension point for plugins: anonymousAccessiblePaths
+- Group support in the Gist Plugin
+- Allow redirection to the Release Page from the Activity Timeline Page
+
+## 4.29.0 - 29 Sep 2018
+- Official Docker image has been available
+- Enhance file edit and delete buttons of the repository viewer
+- Fix Patch button to generate patches for all files in the commit
+- Display confirmation dialog for Transfer Ownership and Garbage collection
+- Fix wrong url encoding in "Compare & pull request"
+
+## 4.28.0 - 1 Sep 2018
+- Proxy support for plugin installation
+- Fix some bugs around pull requests
+
+## 4.27.0 - 29 Jul 2018
+- Create new tag on the browser
+- EditorConfig support
+- Improve issues / pull requests search
+- Some improvements and bug fixes for plugin installation via internet and pull request commenting
+
+## 4.26.0 - 30 Jun 2018
+- Installing plugins from the central registry
+- Repositories tab in the dashboard
+- Fork dialog enhancement
+- Adjust pull request creation suggestor
+- Keep showing incompleted task list
+- New notification hooks
+
+## 4.25.0 - 29 May 2018
+- Security improvements
+- Show mail address at the profile page
+- Task list on commit comments
+- More detailed editing history of issues and pull requests
+- Expose user public keys
+- Download repository improvements
+
+## 4.24.1 - 1 May 2018
+- Fix bug in Web API authentication
+
+## 4.24.0 - 30 Apr 2018
+- Diff for each review comment on pull requests
+- Extra mail addresses support
+- Show tags at the commit list
+- Keep wrap mode of the online editor
+- Renew layout of gitbucket-gist-plugin
+- Web API of gitbucket-ci-plugin
+
+## 4.23.1 - 10 Apr 2018
+- Fix bug that the contents API doesn't work for the repository root
+- Fix shutdown problem in Tomcat deployment
+- Render by plugins at the blob view even if it's a binary file
+
+## 4.23.0 - 31 Mar 2018
+- Allow tail slash in URL
+- Display commit message of tags at the releases page
+- Add labels property to issues and pull requests API response
+- Plugins list API
+- Git authentication with personal access token
+- Max parallel builds and max stored history in CI plugin became configurable
+
+## 4.22.0 - 3 Mar 2018
+- Pull request merge strategy settings
+- Create repository with an empty commit
+- Improve database viewer
+- Update maven-repository-plugin
+
+## 4.21.2 - 27 Jan 2018
+- Bugfix
+
+## 4.21.1 - 27 Jan 2018
+- Bugfix
+
+## 4.21.0 - 27 Jan 2018
+- Release page
+- OpenID Connect support
+- New database viewer
+- Submodule links to web page
+- Clarify close/reopen button
+
+## 4.20.0 - 23 Dec 2017
+- Squash and rebase merge strategy for pull requests
+- Quick pull request creation
+- Download patch from the diff view
+- Fork and create repository are proceeded asynchronously
+- Create new repository by copying existing git repository
+- Hide overflowed repository names in the sidebar
+- Support CreateEvent web hook
+- Display conflicting files if pull request can't be merged
+
+## 4.19.3 - 7 Dec 2017
+- Fix file uploading bug
+- Fix reply comment form behavior in the diff view
+
+## 4.19.2 - 3 Dec 2017
+- Fix routing bug in `CompositeScalatraFilter`
+- Resolve id attribute collision in the web hook editing form
+
+## 4.19.1 - 2 Dec 2017
+- Update gitbucket-notifications-plugin because it had a version compatibility issue
+
+## 4.19.0 - 2 Dec 2017
+- [gitbucket-maven-repository-plugin](https://github.com/takezoe/gitbucket-maven-repository-plugin) is available
+- Upgrade to Scalatra 2.6
+- Improve layout of the system settings page
+- New extension point (`sshCommandProvider`)
+- Dropped [gitbucket-pages-plugin](https://github.com/gitbucket/gitbucket-pages-plugin) from bundled plugins temporary because we couldn't complete update for Scalatra 2.6 before this release.
+
+## 4.18.0 - 14 Oct 2017
+- Form to reply to review comment
+- Display fullname in username suggestion
+- Commit hook plugins are applied to online editing
+- Improve gitbucket-ci-plugin
+
+## 4.17.0 - 30 Sep 2017
+- [gitbucket-ci-plugin](https://github.com/takezoe/gitbucket-ci-plugin) is available
+- Transferring to URL with commit ID
+- Drop uploadable file type limitation
+- Improve Mailer API
+- Web API and webhook enhancement
+
+## 4.16.0 - 2 Sep 2017
+- Support AdminLTE color skin
+- Improve unexpected error handling
+- Show commit status on the commits list
+
+## 4.15.0 - 5 Aug 2017
+- Bundle GitBucket organization plugins
+- Notifications plugin
+- Plugin hot deployment
+- Update Slick to 3.2.1 from 3.2.0
+- Support ed25519 keys for SSH
+- Markdown preview in comment editing forms
+
+## 4.14.1 - 4 Jul 2017
+- Bug fix: Possibility of error in forking repository
+
+## 4.14 - 1 Jul 2017
+- Support priority in issues and pull requests
+- Show icons when the sidebar is collapsed
+- Support gollum events in web hook
+- Support account (user / group) level web hook
+- Add `--max_file_size` option
+- Configuration by system property or environment variable
+
+## 4.13 - 29 May 2017
+- Uploading files into the repository
+- HTML is available in Markdown
+- Added filter box to dropdown menus
+
+## 4.12 - 30 Apr 2017
+- [Gist plug-in](https://github.com/gitbucket/gitbucket-gist-plugin) provides JavaScript to embed snippet
+- Dropdown menu filter in the branch comparing page
+- Caution for the embedded H2 database
+
+## 4.11 - 1 Apr 2017
+- Deploy keys support
+- Auto generate avatar images
+- Collaborators of the private forked repository are copied from the original repository
+- Cache avatar images in the browser
+- New extension point to receive events about repository
+
+## 4.10 - 25 Feb 2017
+- Update to Scala 2.12, Scalatra 2.5 and Slick 3.2
+- Display file size in the file viewer
+
+## 4.9 - 29 Jan 2017
+- GitLFS support
+- Template for issues and pull requests
+- Manual label color editing
+- Account description
+- `--tmp-dir` option for standalone mode
+- More APIs for issues
+  - [List issues for a repository](https://developer.github.com/v3/issues/#list-issues-for-a-repository)
+  - [Create an issue](https://developer.github.com/v3/issues/#create-an-issue)
+
+## 4.8 - 23 Dec 2016
+- Search for repository names from the global header
+- Filter repositories on the sidebar of the dashboard
+- Search issues and wiki
+- Keep pull request comments after new commits are pushed
+- New web API to get a single issue
+- Performance improvement for the repository viewer
+
+## 4.7.1 - 28 Nov 2016
+- Bug fix: group repositories are not shown in the your repositories list on the sidebar
+- Small performance improvement of the dashboard
+
+## 4.7 - 26 Nov 2016
+- New permission system
+- Dropdown filter for issue labels, milestones and assignees
+- Keep sidebar folding status
+- Link from milestone label to the issue list
+
+## 4.6 - 29 Oct 2016
+- Add disable option for forking
+- Add History button to wiki page
+- Git repository URL redirection for GitHub compatibility
+- Get-Content API improvement
+- Indicate who is group master in Members tab in group view
+
+## 4.5 - 29 Sep 2016
+- Attach files by dropping into textarea
+- Issues / Pull requests switcher in dashboard
+- HikariCP could be configured in `GITBUCKET_HOME/database.conf`
+- Improve Cookie security
+- Display commit count on the history button
+- Improve mobile view
+
+## 4.4 - 28 Aug 2016
+- Import a SQL dump file to the database
+- `go get` support in private repositories
+- Sort milestones by due date
+- apache-sshd has been updated to 1.2.0
+
+## 4.3 - 30 Jul 2016
+- Emoji support by [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)
+- User name suggestion
+- Add new web APIs and basic authentication support for API access
+- Root Endpoint
+  - [List endpoints](https://developer.github.com/v3/#root-endpoint)
+  - [List Branches](https://developer.github.com/v3/repos/branches/#list-branches)
+  - [Get contents](https://developer.github.com/v3/repos/contents/#get-contents)
+  - [Get a Reference](https://developer.github.com/v3/git/refs/#get-a-reference)
+  - [List Collaborators](https://developer.github.com/v3/repos/collaborators/#list-collaborators)
+  - [List user repositories](https://developer.github.com/v3/repos/#list-user-repositories)
+  - [Get a group](https://developer.github.com/v3/orgs/#get-an-organization)
+  - [List group repositories](https://developer.github.com/v3/repos/#list-organization-repositories)
+- Add new extension points
+  - `assetsMapping` : Supplies resources in plugin classpath as web assets
+  - `suggestionProvider` : Provides suggestion in the Markdown editing textarea
+  - `textDecorator` : Decorate text nodes in HTML which is converted from Markdown
+
+## 4.2.1 - 3 Jul 2016
+- Fix migration bug
+
+This is hotfix for a critical bug in migration. If you are new installation, use 4.2.0. But if you have an exisiting installation and it had been updated to 4.0 from 3.x, you must update to 4.2.1.
+
+## 4.2 - 2 Jul 2016
+- New UI based on [AdminLTE](https://github.com/almasaeed2010/AdminLTE)
+- git gc
+- Issues and Wiki have been possible to be disabled
+- SMTP configuration test mail
+
+## 4.1 - 4 Jun 2016
+- Generic ssh user
+- Improve branch protection UI
+- Default value of pull request title
+
+## 4.0 - 30 Apr 2016
+- MySQL and PostgreSQL support
+- Data export and import
+- Migration system has been switched to [solidbase](https://github.com/gitbucket/solidbase)
+
+**Note:** You can upgrade to GitBucket 4.0 from 3.14. If your GitBucket is 3.13 or before, you have to upgrade 3.14 at first.
+
+## 3.14 - 30 Apr 2016
+- File attachment and search for wiki pages
+- New extension points to add menus
+- Content-Type of webhooks has been choosable
+
+## 3.13 - 1 Apr 2016
+- Refresh user interface for wide screen
+- Add `pull_request` key in list issues API for pull requests
+- Add `X-Hub-Signature` security to webhooks
+- Provide SHA-256 checksum for `gitbucket.war`
+
+## 3.12 - 27 Feb 2016
+- New GitHub UI
+- Improve mobile view
+- Improve printing style
+- Individual URL for pull request tabs
+- SSH host configuration is separated from HTTP base URL
+
+## 3.11 - 30 Jan 2016
+- Upgrade Scalatra to 2.4
+- Sidebar and Footer for Wiki
+- Branch protection and receive hook extension point for plug-in
+- Limit recent updated repositories list
+- Issue actions look-alike GitHub
+- Web API for labels
+- Requires Java 8
+
+## 3.10 - 30 Dec 2015
+- Move to Bootstrap3
+- New URL for raw contents (`raw/master/doc/activity.md` instead of `blob/master/doc/activity.md?raw=true`)
+- Update xsbt-web-plugin
+- Update H2 database
+
+## 3.9 - 5 Dec 2015
+- GFM inline breaks support in Markdown
+- WebHook on create review comment is available
+- WebHook event trigger is selectable
+
+## 3.8 - 31 Oct 2015
+- Moved to GitHub organization
+- Omit diff view for large differences
+- Repository creation API
+- Render url as link in repository description
+- Expand attachable file types
+
+## 3.7 - 3 Oct 2015
+- Markdown processor has been switched to [markedj](https://github.com/gitbucket/markedj) from pegdown
+- Clone in desktop button
+- Providing MD5 and SHA-1 checksum for `gitbucket.war` has started
+
+## 3.6 - 30 Aug 2015
+- User interface Improvements: Especially, commit list, issues and pull request have been updated largely.
+- Installed plugins list has been available at the system administration console.
+- Pages and repository list in the sidebar have been limited and more pages and repositories link is available.
+- More reference link notation in Markdown has been supported.
+
+## 3.5 - 1 Aug 2015
+- Octicons has been applied
+- Global header has been enhanced. Now it's further similar to GitHub.
+- Default compare / pull request target has been changed to the parent repository
+- A lot of updates for [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin)
+
+## 3.4 - 27 Jun 2015
+- Declarative style plug-in definition
+- New extension point to add markup render
+- go-import support
+
+## 3.3 - 31 May 2015
+- Rich graphical diff for images
+- File finder is available in the repository viewer
+- Blame is displayed at the source viewer
+- Remain user data and repositories even if user is disabled
+- Mobile view improvement
+
+## 3.2 - 3 May 2015
+- Directory history button
+- Compare / pull request button
+- Limit of activity log
+
+## 3.1.1 - 4 Apr 2015
+- Rolled back H2 version to avoid version compatibility issue
+- Plug-ins became possible to access ServletContext
+
+## 3.1 - 28 Mar 2015
+- Web APIs for Jenkins github pull-request builder
+- Improved diff view
+- Bump Scalatra to 2.3.1, sbt to 0.13.8
+
+## 3.0 - 3 Mar 2015
+- New plug-in system is available
+- Connection pooling by c3p0
+- New branch UI
+- Compare between specified commit ids
+
+## 2.8 - 1 Feb 2015
+- New logo and icons
+- New system setting options to control visibility
+- Comment on side-by-side diff
+- Information message on sign-in page
+- Fork repository by group account
+
+## 2.7 - 29 Dec 2014
+- Comment for commit and diff
+- Fix security issue in markdown rendering
+- Some bug fix and improvements
+
+## 2.6 - 24 Nov 2014
+- Search box at issues and pull requests
+- Information from administrator
+- Pull request UI has been updated
+- Move to TravisCI from Buildhive
+- Some bug fix and improvements
+
+## 2.5 - 4 Nov 2014
+- New Dashboard
+- Change datetime format
+- Create branch from Web UI
+- Task list in Markdown
+- Some bug fix and improvements
+
+## 2.4.1 - 6 Oct 2014
+- Bug fix
+
+## 2.4 - 6 Oct 2014
+- New UI is applied to Issues and Pull requests
+- Side-by-side diff is available
+- Fix relative path problem in Markdown links and images
+- Plugin System is disabled in default
+- Some bug fix and improvements
+
+## 2.3 - 1 Sep 2014
+- Scala based plugin system
+- Embedded Jetty war extraction directory moved to `GITBUCKET_HOME/tmp`
+- Some bug fix and improvements
+
+## 2.2.1 - 5 Aug 2014
+- Bug fix
+
+## 2.2 - 4 Aug 2014
+- Plug-in system is available
+- Move to Scala 2.11, Scalatra 2.3 and Slick 2.1
+- tar.gz export for repository contents
+- LDAP authentication improvement (mail address became optional)
+- Show news feed of a private repository to members
+- Some bug fix and improvements
+
+## 2.1 - 6 Jul 2014
+- Upgrade to Slick 2.0 from 1.9
+- Base part of the plug-in system is merged
+- Many bug fix and improvements
+
+## 2.0 - 31 May 2014
+- Modern Github UI
+- Preview in AceEditor
+- Select lines by clicking line number in blob view
+
+## 1.13 - 29 Apr 2014
+- Direct file editing in the repository viewer using AceEditor
+- File attachment for issues
+- Atom feed of user activity
+- Fix some bugs
+
+## 1.12 - 29 Mar 2014
+- SSH repository access is available
+- Allow users can create and management their groups
+- Git submodule support
+- Close issues via commit messages
+- Show repository description below the name on repository page
+- Fix presentation of the source viewer
+- Upgrade to sbt 0.13
+- Fix some bugs
+
+## 1.11.1 - 06 Mar 2014
+- Bug fix
+
+## 1.11 - 01 Mar 2014
+- Base URL for redirection, notification and repository URL box is configurable
+- Remove ```--https``` option because it's possible to substitute in the base url
+- Headline anchor is available for Markdown contents such as Wiki page
+- Improve H2 connectivity
+- Label is available for pull requests not only issues
+- Delete branch button is added
+- Repository icons are updated
+- Select lines of source code by URL hash like `#L10` or `#L10-L15` in repository viewer
+- Display reference to issue from others in comment list
+- Fix some bugs
+
+## 1.10 - 01 Feb 2014
+- Rename repository
+- Transfer repository owner
+- Change default data directory to `HOME/.gitbucket` from `HOME/gitbucket` to avoid problem like #243, but if data directory already exist at HOME/gitbucket, it continues being used.
+- Add LDAP display name attribute
+- Response performance improvement
+- Fix some bugs
+
+## 1.9 - 28 Dec 2013
+- Display GITBUCKET_HOME on the system settings page
+- Fix some bugs
+
+## 1.8 - 30 Nov 2013
+- Add user and group deletion
+- Improve pull request performance
+- Pull request synchronization (when source repository is updated after pull request, it's applied to the pull request)
+- LDAP StartTLS support
+- Enable hard wrapping in Markdown
+- Add new some options to specify the data directory. See details in [Wiki](https://github.com/takezoe/gitbucket/wiki/DirectoryStructure).
+- Fix some bugs
+
+## 1.7 - 26 Oct 2013
+- Support working on Java6 in embedded Jetty mode
+- Add `--host` option to bind specified host name in embedded Jetty mode
+- Add `--https=true` option to force https scheme when using embedded Jetty mode at the back of https proxy
+- Add full name as user property
+- Change link color for absent Wiki pages
+- Add ZIP download button to the repository viewer tab
+- Improve ZIP exporting performance
+- Expand issue and comment textarea for long text automatically
+- Add conflict detection in Wiki
+- Add reverting wiki page from history
+- Match committer to user name by email address
+- Mail notification sender is customizable
+- Add link to changeset in refs comment for issues
+- Fix some bugs
+
+## 1.6 - 1 Oct 2013
+- Web hook
+- Performance improvement for pull request
+- Executable war file
+- Specify suitable Content-Type for downloaded files in the repository viewer
+- Fix some bugs
+
+## 1.5 - 4 Sep 2013
+- Fork and pull request
+- LDAP authentication
+- Mail notification
+- Add an option to turn off the gravatar support
+- Add the branch tab in the repository viewer
+- Encoding auto detection for the file content in the repository viewer
+- Add favicon, header logo and icons for the timeline
+- Specify data directory via environment variable GITBUCKET_HOME
+- Fix some bugs
+
+## 1.4 - 31 Jul 2013
+- Group management
+- Repository search for code and issues
+- Display user related issues on the dashboard
+- Display participants avatar of issues on the issue page
+- Performance improvement for repository viewer
+- Alert by milestone due date
+- H2 database administration console
+- Fix some bugs
+
+## 1.3 - 18 Jul 2013
+- Batch updating for issues
+- Display assigned user on issue list
+- User icon and Gravatar support
+- Convert @xxxx to link to the account page
+- Add copy to clipboard button for git clone URL
+- Allow multi-byte characters as wiki page name
+- Allow to create the empty repository
+- Fix some bugs
+
+## 1.2 - 09 Jul 2013
+- Add activity timeline
+- Bugfix for Git 1.8.1.5 or later
+- Allow multi-byte characters as label
+- Fix some bugs
+
+## 1.1 - 05 Jul 2013
+- Fix some bugs
+- Upgrade to JGit 3.0
+
+## 1.0 - 04 Jul 2013
+- This is a first public release

LICENSE

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -179,7 +178,7 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -187,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright {yyyy} {name of copyright owner}
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,382 +1,78 @@
-GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket)
+GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.svg)](https://gitter.im/gitbucket/gitbucket) [![build](https://github.com/gitbucket/gitbucket/workflows/build/badge.svg?branch=master)](https://github.com/gitbucket/gitbucket/actions?query=workflow%3Abuild+branch%3Amaster) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.gitbucket/gitbucket_2.13) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE)
 =========
 
-GitBucket is a Git platform powered by Scala offering:
-- easy installation
-- high extensibility by plugins
-- API compatibility with Github
+GitBucket is a Git web platform powered by Scala offering:
+
+- Easy installation
+- Intuitive UI
+- High extensibility by plugins
+- API compatibility with GitHub
+
+![GitBucket](https://gitbucket.github.io/img/screenshots/screenshot-repository_viewer.png)
+
+You can try an [online demo](https://gitbucket.herokuapp.com/) *(ID: root / Pass: root)* of GitBucket, and also get the latest information at [GitBucket News](https://gitbucket.github.io/gitbucket-news/).
 
 Features
 --------
-The current version of GitBucket provides a basic features below:
+The current version of GitBucket provides many features such as:
 
-- Public / Private Git repository (http and ssh access)
-- Repository viewer and online file editing
-- Wiki
-- Issues / Pull request
-- Email notification
-- Simple user and group management with LDAP integration
-- Plug-in system
-
-If you want to try the development version of GitBucket, see [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).
+- Public / Private Git repositories (with http/https and ssh access)
+- GitLFS support
+- Repository viewer including an online file editor
+- Issues, Pull Requests and Wiki for repositories
+- Activity timeline and email notifications
+- Account and group management with LDAP integration
+- a Plug-in system
 
 Installation
 --------
-GitBucket requires **Java8**. You have to install beforehand when it's not installed.
+GitBucket requires **Java8**. You have to install it, if it is not already installed.
 
-1. Download latest **gitbucket.war** from [the release page](https://github.com/gitbucket/gitbucket/releases).
-2. Deploy it to the Servlet 3.0 container such as Tomcat 7.x, Jetty 8.x, GlassFish 3.x or higher.
-3. Access **http://[hostname]:[port]/gitbucket/** using your web browser and logged-in with **root** / **root**.
+1. Download the latest **gitbucket.war** from [the releases page](https://github.com/gitbucket/gitbucket/releases) and run it by `java -jar gitbucket.war`.
+2. Go to `http://[hostname]:8080/` and log in with ID: **root** / Pass: **root**.
 
-or you can start GitBucket by `java -jar gitbucket.war` without servlet container. In this case, GitBucket URL is **http://[hostname]:8080/**. You can specify following options.
+You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
 
-- --port=[NUMBER]
-- --prefix=[CONTEXTPATH]
-- --host=[HOSTNAME]
-- --gitbucket.home=[DATA_DIR]
+For more information about installation on Mac or Windows Server (with IIS), or configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
 
-To upgrade GitBucket, only replace gitbucket.war after stop GitBucket. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk.
+To upgrade GitBucket, replace `gitbucket.war` with the new version, after stopping GitBucket. All GitBucket data is stored in `HOME/.gitbucket` by default. So if you want to back up GitBucket's data, copy this directory to the backup location.
 
-About installation on Mac or Windows Server (with IIS), configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
-
-Plug-ins
+Plugins
 --------
-GitBucket has the plug-in system to extend GitBucket from outside of GitBucket. Some plug-ins are available now:
+GitBucket has a plug-in system that allows extra functionality. Officially the following plug-ins are provided:
 
 - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin)
-- [gitbucket-announce-plugin](https://github.com/gitbucket-plugins/gitbucket-announce-plugin)
-- [gitbucket-h2-backup-plugin](https://github.com/gitbucket-plugins/gitbucket-h2-backup-plugin)
-- [gitbucket-desktopnotify-plugin](https://github.com/yoshiyoshifujii/gitbucket-desktopnotify-plugin)
-- [gitbucket-commitgraphs-plugin](https://github.com/yoshiyoshifujii/gitbucket-commitgraphs-plugin)
-- [gitbucket-asciidoctor-plugin](https://github.com/lefou/gitbucket-asciidoctor-plugin)
-- [gitbucket-network-plugin](https://github.com/mrkm4ntr/gitbucket-network-plugin)
 - [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)
+- [gitbucket-pages-plugin](https://github.com/gitbucket/gitbucket-pages-plugin)
+- [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin)
 
-You can find community plugins other than them at [gitbucket community plugins](http://gitbucket-plugins.github.io/).
+You can find more plugins made by the community at [GitBucket community plugins](https://gitbucket-plugins.github.io/).
+
+Building and Development
+-----------
+If you want to try the development version of GitBucket, or want to contribute to the project, please see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/readme.md).
+It provides instructions on building from source and on setting up an IDE for debugging. 
+It also contains documentation of the core concepts used within the project.
 
 Support
 --------
 
-- If you have any question about GitBucket, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raise an issue.
-- Make sure check whether there is a same question or request in the past.
-- When raise a new issue, write subject in **English** at least.
-- We can also support in Japaneses other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
-- First priority of GitBucket is easy installation and API compatibility with GitHub, so we might reject if your request is against it.
+- If you have any questions about GitBucket, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past.
+- If you can't find same question and report, send it to our [Gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
+- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles.
 
-Release Notes
+What's New in 4.36.x
 -------------
-### 4.3 - 30 Jul 2016
-- Emoji support by [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)
-- User name suggestion
-- Add new web APIs and basic authentication support for API access
-- Root Endpoint
-  - [List endpoints](https://developer.github.com/v3/#root-endpoint)
-  - [List Branches](https://developer.github.com/v3/repos/branches/#list-branches)
-  - [Get contents](https://developer.github.com/v3/repos/contents/#get-contents)
-  - [Get a Reference](https://developer.github.com/v3/git/refs/#get-a-reference)
-  - [List Collaborators](https://developer.github.com/v3/repos/collaborators/#list-collaborators)
-  - [List user repositories](https://developer.github.com/v3/repos/#list-user-repositories)
-  - [Get a group](https://developer.github.com/v3/orgs/#get-an-organization)
-  - [List group repositories](https://developer.github.com/v3/repos/#list-organization-repositories)
-- Add new extension points
-  - `assetsMapping` : Supplies resources in plugin classpath as web assets
-  - `suggestionProvider` : Provides suggestion in the Markdown editing textarea 
-  - `textDecorator` : Decorate text nodes in HTML which is converted from Markdown
+### 4.36.2 - 16 Aug 2021
+- Escape user name in avatar image tag
 
-### 4.2.1 - 3 Jul 2016
-- Fix migration bug
+### 4.36.1 - 22 Jul 2021
+- Bump gitbucket-gist-plugin to 4.21.0
 
-This is hotfix for a critical bug in migration. If you are new installation, use 4.2.0. But if you have an exisiting installation and it had been updated to 4.0 from 3.x, you must update to 4.2.1.
+### 4.36.0 - 17 Jul 2021
+- Tag selector in the repository viewer
+- Link issues/pull requests of other repositories
+- Files and lines can be linked in the diff view
+- Option to disable XSS protection
 
-### 4.2 - 2 Jul 2016
-- New UI based on [AdminLTE](https://github.com/almasaeed2010/AdminLTE)
-- git gc
-- Issues and Wiki have been possible to be disabled
-- SMTP configuration test mail
-
-### 4.1 - 4 Jun 2016
-- Generic ssh user
-- Improve branch protection UI
-- Default value of pull request title
-
-### 4.0 - 30 Apr 2016
-- MySQL and PostgreSQL support
-- Data export and import
-- Migration system has been switched to [solidbase](https://github.com/gitbucket/solidbase)
-
-**Note:** You can upgrade to GitBucket 4.0 from 3.14. If your GitBucket is 3.13 or before, you have to upgrade 3.14 at first.
-
-### 3.14 - 30 Apr 2016
-- File attachment and search for wiki pages
-- New extension points to add menus
-- Content-Type of webhooks has been choosable
-
-### 3.13 - 1 Apr 2016
-- Refresh user interface for wide screen
-- Add `pull_request` key in list issues API for pull requests
-- Add `X-Hub-Signature` security to webhooks
-- Provide SHA-256 checksum for `gitbucket.war`
-
-### 3.12 - 27 Feb 2016
-- New GitHub UI
-- Improve mobile view
-- Improve printing style
-- Individual URL for pull request tabs
-- SSH host configuration is separated from HTTP base URL
-
-### 3.11 - 30 Jan 2016
-- Upgrade Scalatra to 2.4
-- Sidebar and Footer for Wiki
-- Branch protection and receive hook extension point for plug-in
-- Limit recent updated repositories list
-- Issue actions look-alike GitHub
-- Web API for labels
-- Requires Java 8
-
-### 3.10 - 30 Dec 2015
-- Move to Bootstrap3
-- New URL for raw contents (`raw/master/doc/activity.md` instead of `blob/master/doc/activity.md?raw=true`)
-- Update xsbt-web-plugin
-- Update H2 database
-
-### 3.9 - 5 Dec 2015
-- GFM inline breaks support in Markdown
-- WebHook on create review comment is available
-- WebHook event trigger is selectable
-
-### 3.8 - 31 Oct 2015
-- Moved to GitHub organization
-- Omit diff view for large differences
-- Repository creation API
-- Render url as link in repository description
-- Expand attachable file types
-
-### 3.7 - 3 Oct 2015
-- Markdown processor has been switched to [markedj](https://github.com/gitbucket/markedj) from pegdown
-- Clone in desktop button
-- Providing MD5 and SHA-1 checksum for `gitbucket.war` has started
-
-### 3.6 - 30 Aug 2015
-- User interface Improvements: Especially, commit list, issues and pull request have been updated largely.
-- Installed plugins list has been available at the system administration console.
-- Pages and repository list in the sidebar have been limited and more pages and repositories link is available.
-- More reference link notation in Markdown has been supported.
-
-### 3.5 - 1 Aug 2015
-- Octicons has been applied
-- Global header has been enhanced. Now it's further similar to GitHub.
-- Default compare / pull request target has been changed to the parent repository
-- A lot of updates for [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin)
-
-### 3.4 - 27 Jun 2015
-- Declarative style plug-in definition
-- New extension point to add markup render
-- go-import support
-
-### 3.3 - 31 May 2015
-- Rich graphical diff for images
-- File finder is available in the repository viewer
-- Blame is displayed at the source viewer
-- Remain user data and repositories even if user is disabled
-- Mobile view improvement
-
-### 3.2 - 3 May 2015
-- Directory history button
-- Compare / pull request button
-- Limit of activity log
-
-### 3.1.1 - 4 Apr 2015
-- Rolled back H2 version to avoid version compatibility issue
-- Plug-ins became possible to access ServletContext
-
-### 3.1 - 28 Mar 2015
-- Web APIs for Jenkins github pull-request builder
-- Improved diff view
-- Bump Scalatra to 2.3.1, sbt to 0.13.8
-
-### 3.0 - 3 Mar 2015
-- New plug-in system is available
-- Connection pooling by c3p0
-- New branch UI
-- Compare between specified commit ids
-
-### 2.8 - 1 Feb 2015
-- New logo and icons
-- New system setting options to control visibility
-- Comment on side-by-side diff
-- Information message on sign-in page
-- Fork repository by group account
-
-### 2.7 - 29 Dec 2014
-- Comment for commit and diff
-- Fix security issue in markdown rendering
-- Some bug fix and improvements
-
-### 2.6 - 24 Nov 2014
-- Search box at issues and pull requests
-- Information from administrator
-- Pull request UI has been updated
-- Move to TravisCI from Buildhive
-- Some bug fix and improvements
-
-### 2.5 - 4 Nov 2014
-- New Dashboard
-- Change datetime format
-- Create branch from Web UI
-- Task list in Markdown
-- Some bug fix and improvements
-
-### 2.4.1 - 6 Oct 2014
-- Bug fix
-
-### 2.4 - 6 Oct 2014
-- New UI is applied to Issues and Pull requests
-- Side-by-side diff is available
-- Fix relative path problem in Markdown links and images
-- Plugin System is disabled in default
-- Some bug fix and improvements
-
-### 2.3 - 1 Sep 2014
-- Scala based plugin system
-- Embedded Jetty war extraction directory moved to `GITBUCKET_HOME/tmp`
-- Some bug fix and improvements
-
-### 2.2.1 - 5 Aug 2014
-- Bug fix
-
-### 2.2 - 4 Aug 2014
-- Plug-in system is available
-- Move to Scala 2.11, Scalatra 2.3 and Slick 2.1
-- tar.gz export for repository contents
-- LDAP authentication improvement (mail address became optional)
-- Show news feed of a private repository to members
-- Some bug fix and improvements
-
-### 2.1 - 6 Jul 2014
-- Upgrade to Slick 2.0 from 1.9
-- Base part of the plug-in system is merged
-- Many bug fix and improvements
-
-### 2.0 - 31 May 2014
-- Modern Github UI
-- Preview in AceEditor
-- Select lines by clicking line number in blob view
-
-### 1.13 - 29 Apr 2014
-- Direct file editing in the repository viewer using AceEditor
-- File attachment for issues
-- Atom feed of user activity
-- Fix some bugs
-
-### 1.12 - 29 Mar 2014
-- SSH repository access is available
-- Allow users can create and management their groups
-- Git submodule support
-- Close issues via commit messages
-- Show repository description below the name on repository page
-- Fix presentation of the source viewer
-- Upgrade to sbt 0.13
-- Fix some bugs
-
-### 1.11.1 - 06 Mar 2014
-- Bug fix
-
-### 1.11 - 01 Mar 2014
-- Base URL for redirection, notification and repository URL box is configurable
-- Remove ```--https``` option because it's possible to substitute in the base url
-- Headline anchor is available for Markdown contents such as Wiki page
-- Improve H2 connectivity
-- Label is available for pull requests not only issues
-- Delete branch button is added
-- Repository icons are updated
-- Select lines of source code by URL hash like `#L10` or `#L10-L15` in repository viewer
-- Display reference to issue from others in comment list
-- Fix some bugs
-
-### 1.10 - 01 Feb 2014
-- Rename repository
-- Transfer repository owner
-- Change default data directory to `HOME/.gitbucket` from `HOME/gitbucket` to avoid problem like #243, but if data directory already exist at HOME/gitbucket, it continues being used.
-- Add LDAP display name attribute
-- Response performance improvement
-- Fix some bugs
-
-### 1.9 - 28 Dec 2013
-- Display GITBUCKET_HOME on the system settings page
-- Fix some bugs
-
-### 1.8 - 30 Nov 2013
-- Add user and group deletion
-- Improve pull request performance
-- Pull request synchronization (when source repository is updated after pull request, it's applied to the pull request)
-- LDAP StartTLS support
-- Enable hard wrapping in Markdown
-- Add new some options to specify the data directory. See details in [Wiki](https://github.com/takezoe/gitbucket/wiki/DirectoryStructure).
-- Fix some bugs
-
-### 1.7 - 26 Oct 2013
-- Support working on Java6 in embedded Jetty mode
-- Add `--host` option to bind specified host name in embedded Jetty mode
-- Add `--https=true` option to force https scheme when using embedded Jetty mode at the back of https proxy
-- Add full name as user property
-- Change link color for absent Wiki pages
-- Add ZIP download button to the repository viewer tab
-- Improve ZIP exporting performance
-- Expand issue and comment textarea for long text automatically
-- Add conflict detection in Wiki
-- Add reverting wiki page from history
-- Match committer to user name by email address
-- Mail notification sender is customizable
-- Add link to changeset in refs comment for issues
-- Fix some bugs
-
-### 1.6 - 1 Oct 2013
-- Web hook
-- Performance improvement for pull request
-- Executable war file
-- Specify suitable Content-Type for downloaded files in the repository viewer
-- Fix some bugs
-
-### 1.5 - 4 Sep 2013
-- Fork and pull request
-- LDAP authentication
-- Mail notification
-- Add an option to turn off the gravatar support
-- Add the branch tab in the repository viewer
-- Encoding auto detection for the file content in the repository viewer
-- Add favicon, header logo and icons for the timeline
-- Specify data directory via environment variable GITBUCKET_HOME
-- Fix some bugs
-
-### 1.4 - 31 Jul 2013
-- Group management
-- Repository search for code and issues
-- Display user related issues on the dashboard
-- Display participants avatar of issues on the issue page
-- Performance improvement for repository viewer
-- Alert by milestone due date
-- H2 database administration console
-- Fix some bugs
-
-### 1.3 - 18 Jul 2013
-- Batch updating for issues
-- Display assigned user on issue list
-- User icon and Gravatar support
-- Convert @xxxx to link to the account page
-- Add copy to clipboard button for git clone URL
-- Allow multi-byte characters as wiki page name
-- Allow to create the empty repository
-- Fix some bugs
-
-### 1.2 - 09 Jul 2013
-- Add activity timeline
-- Bugfix for Git 1.8.1.5 or later
-- Allow multi-byte characters as label
-- Fix some bugs
-
-### 1.1 - 05 Jul 2013
-- Fix some bugs
-- Upgrade to JGit 3.0
-
-### 1.0 - 04 Jul 2013
-- This is a first public release
+See the [change log](CHANGELOG.md) for all of the updates.

build.sbt

@@ -1,97 +1,128 @@
-val Organization = "gitbucket"
-val Name = "gitbucket"
-val GitBucketVersion = "4.3.0"
-val ScalatraVersion = "2.4.1"
-val JettyVersion = "9.3.9.v20160517"
+import com.typesafe.sbt.license.{DepModuleInfo, LicenseInfo}
+import com.jsuereth.sbtpgp.PgpKeys._
 
-lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin)
+val Organization = "io.github.gitbucket"
+val Name = "gitbucket"
+val GitBucketVersion = "4.36.2"
+val ScalatraVersion = "2.8.2"
+val JettyVersion = "9.4.44.v20210927"
+val JgitVersion = "5.13.0.202109080827-r"
+
+lazy val root = (project in file("."))
+  .enablePlugins(SbtTwirl, ScalatraPlugin)
 
 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.11.8"
+scalaVersion := "2.13.7"
+
+scalafmtOnCompile := true
+
+coverageExcludedPackages := ".*\\.html\\..*"
 
 // dependency settings
 resolvers ++= Seq(
   Classpaths.typesafeReleases,
-  "amateras" at "http://amateras.sourceforge.jp/mvn/",
-  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/",
-  "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/"
-)
-libraryDependencies ++= Seq(
-  "org.scala-lang.modules"   %% "scala-java8-compat"           % "0.7.0",
-  "org.eclipse.jgit"          % "org.eclipse.jgit.http.server" % "4.1.2.201602141800-r",
-  "org.eclipse.jgit"          % "org.eclipse.jgit.archive"     % "4.1.2.201602141800-r",
-  "org.scalatra"             %% "scalatra"                     % ScalatraVersion,
-  "org.scalatra"             %% "scalatra-json"                % ScalatraVersion,
-  "org.json4s"               %% "json4s-jackson"               % "3.3.0",
-  "io.github.gitbucket"      %% "scalatra-forms"               % "1.0.0",
-  "commons-io"                % "commons-io"                   % "2.4",
-  "io.github.gitbucket"       % "solidbase"                    % "1.0.0",
-  "io.github.gitbucket"       % "markedj"                      % "1.0.9",
-  "org.apache.commons"        % "commons-compress"             % "1.11",
-  "org.apache.commons"        % "commons-email"                % "1.4",
-  "org.apache.httpcomponents" % "httpclient"                   % "4.5.1",
-  "org.apache.sshd"           % "apache-sshd"                  % "1.0.0",
-  "org.apache.tika"           % "tika-core"                    % "1.13",
-  "com.typesafe.slick"       %% "slick"                        % "2.1.0",
-  "com.novell.ldap"           % "jldap"                        % "2009-10-07",
-  "com.h2database"            % "h2"                           % "1.4.192",
-  "mysql"                     % "mysql-connector-java"         % "5.1.39",
-  "org.postgresql"            % "postgresql"                   % "9.4.1208",
-  "ch.qos.logback"            % "logback-classic"              % "1.1.7",
-  "com.zaxxer"                % "HikariCP"                     % "2.4.6",
-  "com.typesafe"              % "config"                       % "1.3.0",
-  "com.typesafe.akka"        %% "akka-actor"                   % "2.3.15",
-  "fr.brouillard.oss.security.xhub" % "xhub4j-core"            % "1.0.0",
-  "com.enragedginger"        %% "akka-quartz-scheduler"        % "1.4.0-akka-2.3.x" exclude("c3p0","c3p0"),
-  "org.eclipse.jetty"         % "jetty-webapp"                 % JettyVersion     % "provided",
-  "javax.servlet"             % "javax.servlet-api"            % "3.1.0"          % "provided",
-  "junit"                     % "junit"                        % "4.12"           % "test",
-  "org.scalatra"             %% "scalatra-scalatest"           % ScalatraVersion  % "test",
-  "org.scalaz"               %% "scalaz-core"                  % "7.2.4"          % "test",
-  "com.wix"                   % "wix-embedded-mysql"           % "1.0.3"          % "test",
-  "ru.yandex.qatools.embed"   % "postgresql-embedded"          % "1.14"           % "test"
+  Resolver.jcenterRepo,
+  "sonatype-snapshot" at "https://oss.sonatype.org/content/repositories/snapshots/"
 )
 
+libraryDependencies ++= Seq(
+  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % JgitVersion,
+  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % JgitVersion,
+  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.json4s"                      %% "json4s-jackson"              % "4.0.3" cross CrossVersion.for3Use2_13,
+  "commons-io"                      % "commons-io"                   % "2.11.0",
+  "io.github.gitbucket"             % "solidbase"                    % "1.0.3",
+  "io.github.gitbucket"             % "markedj"                      % "1.0.16",
+  "org.apache.commons"              % "commons-compress"             % "1.21",
+  "org.apache.commons"              % "commons-email"                % "1.5",
+  "commons-net"                     % "commons-net"                  % "3.8.0",
+  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.13",
+  "org.apache.sshd"                 % "apache-sshd"                  % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"),
+  "org.apache.tika"                 % "tika-core"                    % "2.1.0",
+  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12" cross CrossVersion.for3Use2_13,
+  "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
+  "com.h2database"                  % "h2"                           % "1.4.199",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.7.4",
+  "org.postgresql"                  % "postgresql"                   % "42.3.1",
+  "ch.qos.logback"                  % "logback-classic"              % "1.2.6",
+  "com.zaxxer"                      % "HikariCP"                     % "4.0.3" exclude ("org.slf4j", "slf4j-api"),
+  "com.typesafe"                    % "config"                       % "1.4.1",
+  "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.1.0",
+  "io.github.java-diff-utils"       % "java-diff-utils"              % "4.11",
+  "org.cache2k"                     % "cache2k-all"                  % "1.6.0.Final",
+  "net.coobird"                     % "thumbnailator"                % "0.4.14",
+  "com.github.zafarkhaja"           % "java-semver"                  % "0.9.0",
+  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "9.19",
+  "org.eclipse.jetty"               % "jetty-webapp"                 % JettyVersion % "provided",
+  "javax.servlet"                   % "javax.servlet-api"            % "3.1.0" % "provided",
+  "junit"                           % "junit"                        % "4.13.2" % "test",
+  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test" cross CrossVersion.for3Use2_13,
+  "org.mockito"                     % "mockito-core"                 % "4.0.0" % "test",
+  "com.dimafeng"                    %% "testcontainers-scala"        % "0.39.11" % "test",
+  "org.testcontainers"              % "mysql"                        % "1.16.2" % "test",
+  "org.testcontainers"              % "postgresql"                   % "1.16.2" % "test",
+  "net.i2p.crypto"                  % "eddsa"                        % "0.3.0",
+  "is.tagomor.woothee"              % "woothee-java"                 % "1.11.0",
+  "org.ec4j.core"                   % "ec4j-core"                    % "0.3.0",
+  "org.kohsuke"                     % "github-api"                   % "1.135" % "test"
+)
+
+libraryDependencies ~= {
+  _.map {
+    case x if x.name == "twirl-api" =>
+      x cross CrossVersion.for3Use2_13
+    case x =>
+      x
+  }
+}
+
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-Ybackend:GenBCode", "-Ydelambdafy:method", "-target:jvm-1.8")
-javacOptions in compile ++= Seq("-target", "8", "-source", "8")
-javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
+scalacOptions := Seq(
+  "-deprecation",
+  "-language:postfixOps",
+  "-opt:l:method",
+  "-feature",
+  "-Wunused:imports",
+  "-Wconf:cat=unused&src=twirl/.*:s,cat=unused&src=scala/gitbucket/core/model/[^/]+\\.scala:s"
+)
+compile / javacOptions ++= Seq("-target", "8", "-source", "8")
+Jetty / javaOptions += "-Dlogback.configurationFile=/logback-dev.xml"
 
 // Test settings
 //testOptions in Test += Tests.Argument("-l", "ExternalDBTest")
-javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test"
-testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() )
-fork in Test := true
+Test / javaOptions += "-Dgitbucket.home=target/gitbucket_home_for_test"
+Test / testOptions += Tests.Setup(() => new java.io.File("target/gitbucket_home_for_test").mkdir())
+Test / fork := true
 
 // Packaging options
 packageOptions += Package.MainClass("JettyLauncher")
 
 // Assembly settings
-test in assembly := {}
-assemblyMergeStrategy in assembly := {
+assembly / test := {}
+assembly / assemblyMergeStrategy := {
   case PathList("META-INF", xs @ _*) =>
-    (xs map {_.toLowerCase}) match {
+    (xs map { _.toLowerCase }) match {
       case ("manifest.mf" :: Nil) => MergeStrategy.discard
-      case _ => MergeStrategy.discard
+      case _                      => MergeStrategy.discard
     }
   case x => MergeStrategy.first
 }
 
-// JRebel
-Seq(jrebelSettings: _*)
-
-jrebel.webLinks += (target in webappPrepare).value
-jrebel.enabled := System.getenv().get("JREBEL") != null
-javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path =>
-  Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
+// Exclude a war file from published artifacts
+signedArtifacts := {
+  signedArtifacts.value.filterNot {
+    case (_, file) => file.getName.endsWith(".war") || file.getName.endsWith(".war.asc")
+  }
 }
 
 // Create executable war file
-val executableConfig = config("executable").hide
-Keys.ivyConfigurations += executableConfig
+val ExecutableConfig = config("executable").hide
+Keys.ivyConfigurations += ExecutableConfig
 libraryDependencies ++= Seq(
   "org.eclipse.jetty" % "jetty-security"     % JettyVersion % "executable",
   "org.eclipse.jetty" % "jetty-webapp"       % JettyVersion % "executable",
@@ -104,69 +135,158 @@ libraryDependencies ++= Seq(
   "org.eclipse.jetty" % "jetty-util"         % JettyVersion % "executable"
 )
 
+// Run package task before test to generate target/webapp for integration test
+Test / test := {
+  _root_.sbt.Keys.`package`.value
+  (Test / test).value
+}
+
 val executableKey = TaskKey[File]("executable")
 executableKey := {
-  import org.apache.ivy.util.ChecksumHelper
-  import java.util.jar.{ Manifest => JarManifest }
-  import java.util.jar.Attributes.{ Name => AttrName }
+  import java.util.jar.Attributes.{Name => AttrName}
+  import java.util.jar.{Manifest => JarManifest}
 
-  val workDir   = Keys.target.value / "executable"
-  val warName   = Keys.name.value + ".war"
+  val workDir = Keys.target.value / "executable"
+  val warName = Keys.name.value + ".war"
 
-  val log       = streams.value.log
+  val log = streams.value.log
   log info s"building executable webapp in ${workDir}"
 
   // initialize temp directory
-  val temp  = workDir / "webapp"
+  val temp = workDir / "webapp"
   IO delete temp
 
   // include jetty classes
-  val jettyJars = Keys.update.value select configurationFilter(name = executableConfig.name)
+  val jettyJars = Keys.update.value select configurationFilter(name = ExecutableConfig.name)
   jettyJars foreach { jar =>
-    IO unzip (jar, temp, (name:String) =>
+    IO unzip (jar, temp, (name: String) =>
       (name startsWith "javax/") ||
-      (name startsWith "org/")
-    )
+        (name startsWith "org/"))
   }
 
   // include original war file
-  val warFile   = (Keys.`package`).value
+  val warFile = (Keys.`package`).value
   IO unzip (warFile, temp)
 
   // include launcher classes
-  val classDir      = (Keys.classDirectory in Compile).value
-  val launchClasses = Seq("JettyLauncher.class" /*, "HttpsSupportConnector.class" */)
+  val classDir = (Compile / Keys.classDirectory).value
+  val launchClasses = Seq("JettyLauncher.class" /*, "HttpsSupportConnector.class" */ )
   launchClasses foreach { name =>
     IO copyFile (classDir / name, temp / name)
   }
 
+  // include plugins
+  val pluginsDir = temp / "WEB-INF" / "classes" / "plugins"
+  IO createDirectory (pluginsDir)
+
+  val plugins = IO readLines (Keys.baseDirectory.value / "src" / "main" / "resources" / "bundle-plugins.txt")
+  plugins.foreach { plugin =>
+    plugin.trim.split(":") match {
+      case Array(pluginId, pluginVersion) =>
+        val url = "https://github.com/" +
+          s"gitbucket/gitbucket-${pluginId}-plugin/releases/download/${pluginVersion}/gitbucket-${pluginId}-plugin-${pluginVersion}.jar"
+        log info s"Download: ${url}"
+        IO transfer (new java.net.URL(url).openStream, pluginsDir / url.substring(url.lastIndexOf("/") + 1))
+      case _ => ()
+    }
+  }
+
   // zip it up
   IO delete (temp / "META-INF" / "MANIFEST.MF")
-  val contentMappings   = (temp.*** --- PathFinder(temp)).get pair relativeTo(temp)
-  val manifest          = new JarManifest
-  manifest.getMainAttributes put (AttrName.MANIFEST_VERSION,    "1.0")
-  manifest.getMainAttributes put (AttrName.MAIN_CLASS,          "JettyLauncher")
-  val outputFile    = workDir / warName
-  IO jar (contentMappings, outputFile, manifest)
+  val contentMappings = (temp.allPaths --- PathFinder(temp)).get pair { file =>
+    IO.relativizeFile(temp, file)
+  }
+  val manifest = new JarManifest
+  manifest.getMainAttributes put (AttrName.MANIFEST_VERSION, "1.0")
+  manifest.getMainAttributes put (AttrName.MAIN_CLASS, "JettyLauncher")
+  val outputFile = workDir / warName
+  IO jar (contentMappings.map { case (file, path) => (file, path.toString) }, outputFile, manifest, None)
 
   // generate checksums
   Seq(
-    "md5"    -> "MD5",
-    "sha1"   -> "SHA-1",
+    "md5" -> "MD5",
+    "sha1" -> "SHA-1",
     "sha256" -> "SHA-256"
-  )
-  .foreach { case (extension, algorithm) =>
-    val checksumFile = workDir / (warName + "." + extension)
-    Checksums generate (outputFile, checksumFile, algorithm)
+  ).foreach {
+    case (extension, algorithm) =>
+      val checksumFile = workDir / (warName + "." + extension)
+      Checksums generate (outputFile, checksumFile, algorithm)
   }
 
   // done
   log info s"built executable webapp ${outputFile}"
   outputFile
 }
-/*
-Keys.artifact in (Compile, executableKey) ~= {
-    _ copy (`type` = "war", extension = "war"))
+publishTo := {
+  val nexus = "https://oss.sonatype.org/"
+  if (version.value.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
+  else Some("releases" at nexus + "service/local/staging/deploy/maven2")
 }
-addArtifact(Keys.artifact in (Compile, executableKey), executableKey)
-*/
+publishMavenStyle := true
+pomIncludeRepository := { _ =>
+  false
+}
+pomExtra := (
+  <url>https://github.com/gitbucket/gitbucket</url>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://github.com/gitbucket/gitbucket</url>
+    <connection>scm:git:https://github.com/gitbucket/gitbucket.git</connection>
+  </scm>
+  <developers>
+    <developer>
+      <id>takezoe</id>
+      <name>Naoki Takezoe</name>
+      <url>https://github.com/takezoe</url>
+    </developer>
+    <developer>
+      <id>shimamoto</id>
+      <name>Takako Shimamoto</name>
+      <url>https://github.com/shimamoto</url>
+    </developer>
+    <developer>
+      <id>tanacasino</id>
+      <name>Tomofumi Tanaka</name>
+      <url>https://github.com/tanacasino</url>
+    </developer>
+    <developer>
+      <id>mrkm4ntr</id>
+      <name>Shintaro Murakami</name>
+      <url>https://github.com/mrkm4ntr</url>
+    </developer>
+    <developer>
+      <id>nazoking</id>
+      <name>nazoking</name>
+      <url>https://github.com/nazoking</url>
+    </developer>
+    <developer>
+      <id>McFoggy</id>
+      <name>Matthieu Brouillard</name>
+      <url>https://github.com/McFoggy</url>
+    </developer>
+  </developers>
+)
+
+Test / testOptions ++= {
+  if (scala.util.Properties.isWin) {
+    Seq(
+      Tests.Exclude(
+        Set(
+          "gitbucket.core.GitBucketCoreModuleSpec"
+        )
+      )
+    )
+  } else {
+    Nil
+  }
+}
+
+Jetty / javaOptions ++= Seq(
+  "-Xdebug",
+  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
+)

command.bat

@@ -1,2 +0,0 @@
-%~d0
-cmd /k cd %~p0

contrib/linux/redhat/README.md

@@ -3,6 +3,7 @@
 RPM spec file and init script for Red Hat Enterprise Linux 6.x. 
 
 To create RPM:
+
 1. Edit `../../gitbucket.conf` to suit.
 2. Edit `gitbucket.init` to suit.
 3. Edit `gitbucket.spec` to suit.

contrib/linux/redhat/selinux/gitbucket.te

@@ -0,0 +1,21 @@
+module gitbucket 1.0;
+
+require {
+	type smtp_port_t;
+	type tomcat_t;
+	type tomcat_var_lib_t;
+	type unreserved_port_t;
+
+	class file { execute };
+	class tcp_socket { name_bind };
+	class tcp_socket { name_connect };
+}
+
+# allow tomcat to send emails
+allow tomcat_t smtp_port_t:tcp_socket { name_connect };
+
+# allow file executes, required during repo creation
+allow tomcat_t tomcat_var_lib_t:file { execute };
+
+# allow tomcat to serve repositories via SSH
+allow tomcat_t unreserved_port_t:tcp_socket { name_bind };

contrib/linux/redhat/selinux/readme.md

@@ -0,0 +1,32 @@
+# Red Hat Enterprise Linux / CentOS SELinux policy module for GitBucket
+
+One way to run GitBucket on Enterprise Linux is under Tomcat. Since EL 7.4, Tomcat is no longer unconfined.
+Thus since 7.4, Enterprise Linux blocks certain operations that are required for GitBucket to work properly:
+
+* Tomcat is not allowed to connect to SMTP ports, which is required to send email notifications.
+* Tomcat is not allowed to execute files, which is required for creating repositories.
+* Tomcat is not allowed to act as a server on unreserved ports, which is required for serving repositories via SSH.
+
+To mitigate this, you can use the SELinux policy module provided as `gitbucket.te`. You can deploy the module with the
+attached script, e.g.:
+
+~~~
+./sedeploy.sh gitbucket
+~~~
+
+You most likely also need to fix file contexts on your system. Assuming a new, default Tomcat installation on 7.4, you
+can do so by issuing the following commands:
+
+~~~
+GITBUCKET_HOME='/usr/share/tomcat/.gitbucket'
+mkdir -p ${GITBUCKET_HOME}
+chown tomcat.tomcat ${GITBUCKET_HOME}
+semanage fcontext -a -t tomcat_var_lib_t "${GITBUCKET_HOME}(/.*)?"
+restorecon -rv ${GITBUCKET_HOME}
+
+JAVA_CONF='/usr/share/tomcat/.java'
+mkdir -p ${JAVA_CONF}
+chown tomcat.tomcat ${JAVA_CONF}
+semanage fcontext -a -t tomcat_cache_t "${JAVA_CONF}(/.*)?"
+restorecon -rv ${JAVA_CONF}
+~~~

contrib/linux/redhat/selinux/sedeploy.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+MODULE=${1}
+
+# this will create a .mod file
+checkmodule -M -m -o ${MODULE}.mod ${MODULE}.te
+
+# this will create a compiled semodule
+semodule_package -m ${MODULE}.mod -o ${MODULE}.pp
+
+# this will install the module
+semodule -i ${MODULE}.pp

doc/authenticator.md

@@ -2,7 +2,7 @@ Authentication in Controller
 ========
 GitBucket provides many [authenticators](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/util/Authenticator.scala) to access controlling in the controller.
 
-For example, in the case of `RepositoryViwerController`,
+For example, in the case of `RepositoryViewerController`,
 it references three authenticators: `ReadableUsersAuthenticator`, `ReferrerAuthenticator` and `CollaboratorsAuthenticator`.
 
 ```scala
@@ -19,13 +19,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   ...
 ```
 
-Authenticators provides a method to add guard to actions in the controller:
+Authenticators provide a method to add guard to actions in the controller:
 
 - `ReadableUsersAuthenticator` provides `readableUsersOnly` method
 - `ReferrerAuthenticator` provides `referrersOnly` method
 - `CollaboratorsAuthenticator` provides `collaboratorsOnly` method
 
-These methods are available in each actions as below:
+These methods are available in each action as below:
 
 ```scala
 // Allows only the repository owner (or manager for group repository) and administrators.
@@ -38,7 +38,7 @@ get("/:owner/:repository/new/*")(collaboratorsOnly { repository =>
   ...
 })
 
-// Allows only signed in users which can access the repository.
+// Allows only signed-in users which can access the repository.
 post("/:owner/:repository/commit/:id/comment/new", commentForm)(readableUsersOnly { (form, repository) =>
   ...
 })
@@ -50,11 +50,11 @@ Currently, GitBucket provides below authenticators:
 |--------------------------|-----------------|--------------------------------------------------------------------------------------|
 |OneselfAuthenticator      |oneselfOnly      |Allows only oneself and administrators.                                               |
 |OwnerAuthenticator        |ownerOnly        |Allows only the repository owner and administrators.                                  |
-|UsersAuthenticator        |usersOnly        |Allows only signed in users.                                                          |
+|UsersAuthenticator        |usersOnly        |Allows only signed-in users.                                                          |
 |AdminAuthenticator        |adminOnly        |Allows only administrators.                                                           |
 |CollaboratorsAuthenticator|collaboratorsOnly|Allows only collaborators and administrators.                                         |
 |ReferrerAuthenticator     |referrersOnly    |Allows only the repository owner (or manager for group repository) and administrators.|
-|ReadableUsersAuthenticator|readableUsersOnly|Allows only signed in users which can access the repository.                          |
+|ReadableUsersAuthenticator|readableUsersOnly|Allows only signed-in users which can access the repository.                          |
 |GroupManagerAuthenticator |managersOnly     |Allows only the group managers.                                                       |
 
-Of course, if you make a new plugin, you can define a your own authenticator according to requirement in your plugin.
+Of course, if you make a new plugin, you can implement your own authenticator according to requirement in your plugin.

doc/auto_update.md

@@ -2,7 +2,7 @@ Automatic Schema Updating
 ========
 GitBucket updates database schema automatically using [Solidbase](https://github.com/gitbucket/solidbase) in the first run after the upgrading.
 
-To release a new version of GitBucket, add the version definition to the [gitbucket.core.GitBucketCoreModule](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/GitBucketCoreModule.scala) at first.
+To release a new version of GitBucket, add the version definition to [gitbucket.core.GitBucketCoreModule](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/GitBucketCoreModule.scala) at first.
 
 ```scala
 object GitBucketCoreModule extends Module("gitbucket-core",
@@ -17,7 +17,7 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 )
 ```
 
-Next, add a XML file which updates database schema into [/src/main/resources/update/](https://github.com/gitbucket/gitbucket/tree/master/src/main/resources/update) with a filenane defined in `GitBucketCoreModule`.
+Next, add a XML file which updates database schema into [/src/main/resources/update/](https://github.com/gitbucket/gitbucket/tree/master/src/main/resources/update) with a filename defined in `GitBucketCoreModule`.
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -31,9 +31,9 @@ Next, add a XML file which updates database schema into [/src/main/resources/upd
 </changeSet>
 ```
 
-Solidbase stores the current version to `VERSIONS` table and checks it at start-up. If the stored version differs from the actual version, it executes differences between the stored version and the actual version.
+Solidbase stores the current version to `VERSIONS` table and checks it at start-up. If the stored version different from the actual version, it executes differences between the stored version and the actual version.
 
-We can add the SQL file instead of the XML file using `SqlMigration`. It try to load a SQL file from classpath as following order:
+We can add the SQL file instead of the XML file using `SqlMigration`. It tries to load a SQL file from classpath in the following order:
 
 1. Specified path (if specified)
 2. `${moduleId}_${version}_${database}.sql`
@@ -51,4 +51,4 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 )
 ```
 
-See more details [README of Solidbase](https://github.com/gitbucket/solidbase).
+See more details at [README of Solidbase](https://github.com/gitbucket/solidbase).

doc/build.md

@@ -0,0 +1,61 @@
+How to build and run from the source tree
+========
+
+First of all, Install [sbt](http://www.scala-sbt.org/index.html).
+
+```shell
+$ brew install sbt
+```
+
+Run for Development
+--------
+
+If you want to test GitBucket, type the following command in the root directory of the source tree.
+
+```shell
+$ sbt ~jetty:start
+```
+
+Then access `http://localhost:8080/` in your browser. The default administrator account is `root` and password is `root`.
+
+Source code modifications are detected and a reloading happens automatically. You can modify the logging configuration by editing `src/main/resources/logback-dev.xml`.
+
+Build war file
+--------
+
+To build a war file, run the following command:
+
+```shell
+$ sbt package
+```
+
+`gitbucket_2.13-x.x.x.war` is generated into `target/scala-2.13`.
+
+To build an executable war file, run
+
+```shell
+$ sbt executable
+```
+
+at the top of the source tree. It generates executable `gitbucket.war` into `target/executable`. We release this war file as release artifact.
+
+Run tests spec
+---------
+Before running tests, you need to install docker.
+
+```shell
+$ brew cask install docker       # Install Docker
+$ open /Applications/Docker.app  # Start Docker
+```
+
+To run the full series of tests, run the following command:
+
+```shell
+$ sbt test
+```
+
+If you don't have docker, you can skip docker tests which require docker as follows:
+
+```shell
+$ sbt "testOnly * -- -l ExternalDBTest"
+```

doc/comment_action.md

@@ -6,17 +6,26 @@ The details are saved at `ISSUE_COMMENT` table.
 To determine if it was any operation, you see the `ACTION` column.
 And in the case of some actions, `CONTENT` column value contains additional information.
 
-|ACTION         |CONTENT          |
-|---------------|-----------------|
-|comment        |comment          |
-|close_comment  |comment          |
-|reopen_comment |comment          |
-|close          |"Close"          |
-|reopen         |"Reopen"         |
-|commit         |comment commitId |
-|merge          |comment          |
-|delete_branch  |branchName       |
-|refer          |issueId:title    |
+|ACTION          |CONTENT                   |
+|----------------|--------------------------|
+|comment         |comment                   |
+|close_comment   |comment                   |
+|reopen_comment  |comment                   |
+|close           |"Close"                   |
+|reopen          |"Reopen"                  |
+|commit          |comment commitId          |
+|merge           |comment                   |
+|delete_branch   |branchName                |
+|refer           |issueId:title             |
+|add_label       |labelName                 |
+|delete_label    |labelName                 |
+|change_priority |oldPriority:priority      |
+|change_milestone|oldMilestone:milestone    |
+|assign          |oldAssigned:assigned      |
+|change_title    |oldTitle(CRLF)title \[1\] |
+
+\[1\]: (CRLF) is "\r\n"
+
 
 ### comment
 
@@ -54,3 +63,27 @@ Therefore, this comment is not displayed, and not counted as a comment.
 
 This value is saved when other issue or issue comment contains reference to the issue like `#issueId`.
 At the same time, store id and title of the referrer issue as `id:title`.
+
+### add_label
+
+This value is saved when users have added the label.
+
+### delete_label
+
+This value is saved when users have deleted the label.
+
+### change_priority
+
+This value is saved when users have changed the priority.
+
+### change_milestone
+
+This value is saved when users have changed the milestone.
+
+### assign
+
+This value is saved when users have assign issue/PR to user or remove the assign.
+
+### change_title
+
+This value is saved when users have changed the title.

doc/debug.md

@@ -0,0 +1,22 @@
+Debug GitBucket on IntelliJ
+========
+Add following configuration for allowing remote debugging to `buils.sbt`:
+
+```scala
+javaOptions in Jetty ++= Seq(
+  "-Xdebug",
+  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
+)
+```
+
+Run GitBucket:
+
+```shell
+$ sbt ~jetty:start
+```
+
+In IntelliJ, create remote debug configuration as follows. Make sure port number is same as above configuration.
+
+![Remote debug configuration on IntelliJ](remote_debug.png)
+
+Then you can start debugging on IntelliJ!

doc/directory.md

@@ -9,16 +9,17 @@ This directory has following structure:
   * /repositories 
     * /USER_NAME
       * /REPO_NAME.git (substance of repository. GitServlet sees this directory)
+      * /REPO_NAME.wiki.git (wiki repository)
       * /REPO_NAME
         * /issues (files which are attached to issue)
-      * /REPO_NAME.wiki.git (wiki repository)
+        * /lfs (LFS managed files)
   * /data
     * /USER_NAME
       * /files
         * avatar.xxx (image file of user avatar)
   * /plugins
-    * /PLUGIN_NAME
-      * plugin.js
+    * plugin.jar
+    * /.installed (copied available plugins from the parent directory automatically)
   * /tmp
     * /_upload
       * /SESSION_ID (removed at session timeout)

doc/how_to_run.md

@@ -1,42 +0,0 @@
-How to run from the source tree
-========
-
-Run for Development
---------
-
-If you want to test GitBucket, input following command at the root directory of the source tree.
-
-```
-$ sbt ~jetty:start
-```
-
-Then access to `http://localhost:8080/` by your browser. The default administrator account is `root` and password is `root`.
-
-Source code modification is detected and reloaded automatically. You can modify logging configuration by editing `src/main/resources/logback-dev.xml`.
-
-Build war file
---------
-
-To build war file, run the following command:
-
-```
-$ sbt package
-```
-
-`gitbucket_2.11-x.x.x.war` is generated into `target/scala-2.11`.
-
-To build executable war file, run
-
-```
-$ sbt executable
-```
-
-at the top of the source tree. It generates executable `gitbucket.war` into `target/executable`. We release this war file as release artifact.
-
-Run tests spec
----------
-To run the full serie of tests, run the following command:
-
-```
-sbt test
-```

doc/jrebel.md

@@ -1,148 +0,0 @@
-JRebel integration (optional)
-=============================
-
-[JRebel](http://zeroturnaround.com/software/jrebel/) is a JVM plugin that makes developing web apps much faster.
-JRebel is generally able to eliminate the need for the following slow "app restart" in sbt following a code change:
-
-```
-> jetty:start
-```
-
-While JRebel is not open source, it does reload your code faster than the `~;copy-resources;aux-compile` way of doing things using `sbt`.
-
-It's only used during development, and doesn't change your deployed app in any way.
-
-JRebel used to be free for Scala developers, but that changed recently, and now there's a cost associated with usage for Scala. There are trial plans and free non-commercial licenses available if you just want to try it out.
-
-----
-
-## 1. Get a JRebel license
-
-Sign up for a [usage plan](https://my.jrebel.com/). You will need to create an account.
-
-## 2. Download JRebel
-
-Download the most recent ["nosetup" JRebel zip](http://zeroturnaround.com/software/jrebel/download/prev-releases/).
-Next, unzip the downloaded file.
-
-## 3. Activate
-
-Follow the [instructions on the JRebel website](http://zeroturnaround.com/software/jrebel/download/prev-releases/) to activate your downloaded JRebel.
-
-You can use the default settings for all the configurations.
-
-You don't need to integrate with your IDE, since we're using sbt to do the servlet deployment.
-
-## 4. Tell jvm where JRebel is
-
-Fortunately, the gitbucket project is already set up to use JRebel.
-You only need to tell jvm where to find the jrebel jar.
-
-To do so, edit your shell resource file (usually `~/.bash_profile` on Mac, and `~/.bashrc` on Linux), and add the following line:
-
-```bash
-export JREBEL=/path/to/jrebel/jrebel.jar
-```
-
-For example, if you unzipped your JRebel download in your home directory, you whould use:
-
-```bash
-export JREBEL=~/jrebel/jrebel.jar
-```
-
-Now reload your shell:
-
-```
-$ source ~/.bash_profile # on Mac
-$ source ~/.bashrc       # on Linux
-```
-
-## 5. See it in action!
-
-Now you're ready to use JRebel with the gitbucket.
-When you run sbt as normal, you will see a long message from JRebel, indicating it has loaded.
-Here's an abbreviated version of what you will see:
-
-```
-$ ./sbt
-[info] Loading project definition from /git/gitbucket/project
-[info] Set current project to gitbucket (in build file:/git/gitbucket/)
->
-```
-
-You will start the servlet container slightly differently now that you're using sbt.
-
-```
-> jetty:start
-:
-[info] starting server ...
-[success] Total time: 3 s, completed Jan 3, 2016 9:47:55 PM
-2016-01-03 21:47:57 JRebel:
-2016-01-03 21:47:57 JRebel: A newer version '6.3.1' is available for download
-2016-01-03 21:47:57 JRebel: from http://zeroturnaround.com/software/jrebel/download/
-2016-01-03 21:47:57 JRebel:
-2016-01-03 21:47:58 JRebel: Contacting myJRebel server ..
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/classes' will be monitored for changes.
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/test-classes' will be monitored for changes.
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/webapp' will be monitored for changes.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  #############################################################
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  JRebel Legacy Agent 6.2.5 (201509291538)
-2016-01-03 21:48:00 JRebel:  (c) Copyright ZeroTurnaround AS, Estonia, Tartu.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Over the last 30 days JRebel prevented
-2016-01-03 21:48:00 JRebel:  at least 182 redeploys/restarts saving you about 7.4 hours.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Over the last 324 days JRebel prevented
-2016-01-03 21:48:00 JRebel:  at least 1538 redeploys/restarts saving you about 62.4 hours.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Licensed to nazo king (using myJRebel).
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  #############################################################
-2016-01-03 21:48:00 JRebel:
-:
-
-> ~ copy-resources
-[success] Total time: 0 s, completed Jan 3, 2016 9:13:54 PM
-1. Waiting for source changes... (press enter to interrupt)
-```
-
-Finally, change your code.
-For example, you can change the title on `src/main/twirl/gitbucket/core/main.scala.html` like this:
-
-```html
-:
-  <a class="navbar-brand" href="@path/">
-    <img src="@assets/common/images/gitbucket.png" style="width: 24px; height: 24px;"/>GitBucket
-    @defining(AutoUpdate.getCurrentVersion){ version =>
-      <span class="header-version">@version.majorVersion.@version.minorVersion</span>
-    }
-    change code !!!!!!!!!!!!!!!!
-  </a>
-:
-```
-
-If JRebel is doing is correctly installed you will see a notice for you:
-
-```
-1. Waiting for source changes... (press enter to interrupt)
-2016-01-03 21:48:42 JRebel: Reloading class 'gitbucket.core.html.main$'.
-[info] Wrote rebel.xml to /git/gitbucket/target/scala-2.11/resource_managed/main/rebel.xml
-[info] Compiling 1 Scala source to /git/gitbucket/target/scala-2.11/classes...
-[success] Total time: 3 s, completed Jan 3, 2016 9:48:55 PM
-2. Waiting for source changes... (press enter to interrupt)
-```
-
-And you reload browser, JRebel give notice of that it has reloaded classes:
-
-```
-[success] Total time: 3 s, completed Jan 3, 2016 9:48:55 PM
-2. Waiting for source changes... (press enter to interrupt)
-2016-01-03 21:49:13 JRebel: Reloading class 'gitbucket.core.html.main$'.
-```
-
-## 6. Limitations
-
-JRebel is nearly always able to eliminate the need to explicitly reload your container after a code change. However, if you change any of your routes patterns, there is nothing JRebel can do, you will have to run `jetty:start`.

doc/licenses.md

@@ -0,0 +1,131 @@
+# gitbucket-licenses
+
+Category | License | Dependency | Notes
+--- | --- | --- | ---
+Apache | [         Apache License, Version 2.0       ](         http://opensource.org/licenses/apache2.0.php       ) | org.osgi # org.osgi.core # 4.3.1 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.googlecode.javaewah # JavaEWAH # 1.1.6 | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) | org.cache2k # cache2k-all # 1.2.0.Final | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) | org.cache2k # cache2k-api # 1.2.0.Final | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) | org.cache2k # cache2k-core # 1.2.0.Final | <notextile></notextile>
+Apache | [Apache 2](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.objenesis # objenesis # 2.6 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # apache-sshd # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-cli # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-common # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-core # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-putty # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-scp # 2.1.0 | <notextile></notextile>
+Apache | [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) | org.apache.sshd # sshd-sftp # 2.1.0 | <notextile></notextile>
+Apache | [Apache License v2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.java.dev.jna # jna # 4.5.1 | <notextile></notextile>
+Apache | [Apache License v2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.java.dev.jna # jna-platform # 4.5.1 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.github.stephenc.jcip # jcip-annotations # 1.0-1 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.kohlschutter.junixsocket # junixsocket-common # 2.0.4 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.kohlschutter.junixsocket # junixsocket-native-common # 2.0.4 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0) | com.typesafe # config # 1.3.3 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.typesafe.akka # akka-actor_2.12 # 2.5.18 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | commons-io # commons-io # 2.6 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | is.tagomor.woothee # woothee-java # 1.8.0 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-compress # 1.18 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-email # 1.5 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.commons # commons-lang3 # 3.6 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpclient # 4.5.6 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpcore # 4.4.10 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.httpcomponents # httpmime # 4.5.3 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.apache.tika # tika-core # 1.19.1 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.ec4j.core # ec4j-core # 0.0.3 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.liquibase # liquibase-core # 3.6.2 | <notextile></notextile>
+Apache | [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.yaml # snakeyaml # 1.18 | <notextile></notextile>
+Apache | [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html‎) | com.nimbusds # oauth2-oidc-sdk # 5.64.4 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-http # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-io # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-security # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-server # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-servlet # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-util # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-webapp # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License - Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.eclipse.jetty # jetty-xml # 9.4.6.v20170531 | <notextile></notextile>
+Apache | [Apache Software License, Version 1.1](http://www.apache.org/licenses/LICENSE-1.1) | org.bouncycastle # bcpg-jdk15on # 1.60 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | com.github.bkromhout # java-diff-utils # 2.1.1 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0.html) | com.typesafe.play # twirl-api_2.12 # 1.3.15 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-ast_2.12 # 3.5.2 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-core_2.12 # 3.5.2 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-jackson_2.12 # 3.5.2 | <notextile></notextile>
+Apache | [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.json4s # json4s-scalap_2.12 # 3.5.2 | <notextile></notextile>
+Apache | [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0) | org.scala-lang # scala-library # 2.12.8 | <notextile></notextile>
+Apache | [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0) | org.scala-lang # scala-reflect # 2.12.8 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.enragedginger # akka-quartz-scheduler_2.12 # 1.7.0-akka-2.5.x | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-annotations # 2.8.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-core # 2.8.4 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-databind # 2.8.4 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.github.takezoe # blocking-slick-32_2.12 # 0.0.11 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.google.code.findbugs # jsr305 # 3.0.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.nimbusds # lang-tag # 1.4.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.nimbusds # nimbus-jose-jwt # 5.5 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.zaxxer # HikariCP # 3.2.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | eu.medsea.mimeutil # mime-util # 2.1.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # markedj # 1.0.15 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | io.github.gitbucket # solidbase # 1.0.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy # 1.9.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.bytebuddy # byte-buddy-agent # 1.9.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.minidev # accessors-smart # 1.2 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | net.minidev # json-smart # 2.3 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.jetbrains # annotations # 15.0 | <notextile></notextile>
+Apache | [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | org.quartz-scheduler # quartz # 2.3.0 | <notextile></notextile>
+Apache | [the Apache License, ASL Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.scalactic # scalactic_2.12 # 3.0.3 | <notextile></notextile>
+Apache | [the Apache License, ASL Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) | org.scalatest # scalatest_2.12 # 3.0.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-common_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-forms_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-json_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-scalatest_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra-test_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD](http://github.com/scalatra/scalatra/raw/HEAD/LICENSE) | org.scalatra # scalatra_2.12 # 2.6.3 | <notextile></notextile>
+BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-java8-compat_2.12 # 0.8.0 | <notextile></notextile>
+BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-parser-combinators_2.12 # 1.0.6 | <notextile></notextile>
+BSD | [BSD 3-clause](http://opensource.org/licenses/BSD-3-Clause) | org.scala-lang.modules # scala-xml_2.12 # 1.0.6 | <notextile></notextile>
+BSD | [BSD-2-Clause](https://jdbc.postgresql.org/about/license.html) | org.postgresql # postgresql # 42.2.5 | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit # 5.2.0.201812061821-r | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit.archive # 5.2.0.201812061821-r | <notextile></notextile>
+BSD | [Eclipse Distribution License (New BSD License)](null) | org.eclipse.jgit # org.eclipse.jgit.http.server # 5.2.0.201812061821-r | <notextile></notextile>
+BSD | [New BSD License](http://www.opensource.org/licenses/bsd-license.php) | org.hamcrest # hamcrest-core # 1.3 | <notextile></notextile>
+BSD | [Revised BSD](http://www.jcraft.com/jsch/LICENSE.txt) | com.jcraft # jsch # 0.1.54 | <notextile></notextile>
+BSD | [Revised BSD](http://www.jcraft.com/jzlib/LICENSE.txt) | com.jcraft # jzlib # 1.1.1 | <notextile></notextile>
+BSD | [Two-clause BSD-style license](http://github.com/slick/slick/blob/master/LICENSE.txt) | com.typesafe.slick # slick_2.12 # 3.2.1 | <notextile></notextile>
+CC0 | [CC0](http://creativecommons.org/publicdomain/zero/1.0/) | org.reactivestreams # reactive-streams # 1.0.0 | <notextile></notextile>
+CC0 | [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/) | net.i2p.crypto # eddsa # 0.3.0 | <notextile></notextile>
+CC0 | [CC0 1.0 Universal License](http://creativecommons.org/publicdomain/zero/1.0/) | org.scijava # native-lib-loader # 2.0.2 | <notextile></notextile>
+CDDL | [Common Development and Distribution License (CDDL) v1.0](https://glassfish.dev.java.net/public/CDDLv1.0.html) | javax.activation # activation # 1.1 | <notextile></notextile>
+GPL | [CDDL/GPLv2+CE](https://javaee.github.io/javamail/LICENSE) | com.sun.mail # javax.mail # 1.6.1 | <notextile></notextile>
+GPL | [GPL2 w/ CPE](https://oss.oracle.com/licenses/CDDL+GPL-1.1) | javax.xml.bind # jaxb-api # 2.3.0 | <notextile></notextile>
+GPL with Classpath Extension | [CDDL + GPLv2 with classpath exception](https://github.com/javaee/javax.annotation/blob/master/LICENSE) | javax.annotation # javax.annotation-api # 1.3.1 | <notextile></notextile>
+GPL with Classpath Extension | [CDDL + GPLv2 with classpath exception](https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html) | javax.servlet # javax.servlet-api # 3.1.0 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) | ch.qos.logback # logback-classic # 1.2.3 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) | ch.qos.logback # logback-core # 1.2.3 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License, Version 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) | com.mchange # c3p0 # 0.9.5.2 | <notextile></notextile>
+LGPL | [GNU Lesser General Public License, Version 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) | com.mchange # mchange-commons-java # 0.2.11 | <notextile></notextile>
+LGPL | [LGPL-2.1](null) | org.mariadb.jdbc # mariadb-java-client # 2.3.0 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.rnorth # tcp-unix-socket-proxy # 1.0.2 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.rnorth.duct-tape # duct-tape # 1.0.7 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.rnorth.visible-assertions # visible-assertions # 2.1.1 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # database-commons # 1.10.3 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # jdbc # 1.10.3 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # mysql # 1.10.3 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # postgresql # 1.10.3 | <notextile></notextile>
+MIT | [MIT](http://opensource.org/licenses/MIT) | org.testcontainers # testcontainers # 1.10.3 | <notextile></notextile>
+MIT | [MIT License](http://www.opensource.org/licenses/mit-license.php) | org.slf4j # slf4j-api # 1.7.25 | <notextile></notextile>
+MIT | [The MIT License](http://www.opensource.org/licenses/mit-license.php) | com.github.zafarkhaja # java-semver # 0.9.0 | <notextile></notextile>
+MIT | [The MIT License](https://jsoup.org/license) | org.jsoup # jsoup # 1.10.2 | <notextile></notextile>
+MIT | [The MIT License](https://github.com/mockito/mockito/blob/master/LICENSE) | org.mockito # mockito-core # 2.23.4 | <notextile></notextile>
+MIT | [The MIT License (MIT)](https://opensource.org/licenses/MIT) | com.dimafeng # testcontainers-scala_2.12 # 0.22.0 | <notextile></notextile>
+MIT | [The MIT License (MIT)](http://www.opensource.org/licenses/mit-license.html) | net.coobird # thumbnailator # 0.4.8 | <notextile></notextile>
+Mozilla | [MPL 2.0 or EPL 1.0](http://h2database.com/html/license.html) | com.h2database # h2 # 1.4.197 | <notextile></notextile>
+Mozilla | [Mozilla Public License 1.1 (MPL 1.1)](http://www.mozilla.org/MPL/MPL-1.1.html) | com.googlecode.juniversalchardet # juniversalchardet # 1.0.3 | <notextile></notextile>
+unrecognized | [Bouncy Castle Licence](http://www.bouncycastle.org/licence.html) | org.bouncycastle # bcpkix-jdk15on # 1.60 | <notextile></notextile>
+unrecognized | [Bouncy Castle Licence](http://www.bouncycastle.org/licence.html) | org.bouncycastle # bcprov-jdk15on # 1.60 | <notextile></notextile>
+unrecognized | [Eclipse Public License 1.0](http://www.eclipse.org/legal/epl-v10.html) | junit # junit # 4.12 | <notextile></notextile>
+unrecognized | [The OpenLDAP Public License](http://www.openldap.org/software/release/license.html) | com.novell.ldap # jldap # 2009-10-07 | <notextile></notextile>
+unrecognized | [none specified](none specified) | com.thoughtworks.paranamer # paranamer # 2.8 | <notextile></notextile>
+unrecognized | [none specified](none specified) | commons-codec # commons-codec # 1.10 | <notextile></notextile>
+unrecognized | [none specified](none specified) | commons-logging # commons-logging # 1.2 | <notextile></notextile>
+unrecognized | [none specified](none specified) | fr.brouillard.oss.security.xhub # xhub4j-core # 1.0.0 | <notextile></notextile>
+unrecognized | [none specified](none specified) | org.ow2.asm # asm # 5.0.4 | <notextile></notextile>
+unrecognized | [none specified](none specified) | tomcat # tomcat-apr # 5.5.23 | <notextile></notextile>
+

doc/notification.md

@@ -1,23 +0,0 @@
-Notification Email
-========
-
-GitBucket sends email to target users by enabling the notification email by an administrator.
-
-The timing of the notification are as follows:
-
-##### at the issue registration (new issue, new pull request)
-When a record is saved into the ```ISSUE``` table, GitBucket does the notification.
-
-##### at the comment registration
-Among the records in the ```ISSUE_COMMENT``` table, them to be counted as a comment (i.e. the record ```ACTION``` column value is "comment" or "close_comment" or "reopen_comment") are saved, GitBucket does the notification.
-
-##### at the status update (close, reopen, merge)
-When the ```CLOSED``` column value is updated, GitBucket does the notification.
-
-Notified users are as follows:
-
-* individual repository's owner
-* collaborators
-* participants
-
-However, the operation in person is excluded from the target.

doc/readme.md

@@ -1,12 +1,12 @@
 Developer's Guide
 ========
- * [How to run from source tree](how_to_run.md)
+ * [Build from source tree](build.md)
+ * [Debug on IntelliJ](debug.md)
  * [Directory Structure](directory.md)
  * [Mapping and Validation](validation.md)
  * [Authentication in Controller](authenticator.md)
  * [About Action in Issue Comment](comment_action.md)
  * [Activity Types](activity.md)
- * [Notification Email](notification.md)
  * [Automatic Schema Updating](auto_update.md)
  * [Release Operation](release.md)
- * [JRebel integration (optional)](jrebel.md)
+ * [Licenses](licenses.md)

doc/release.md

@@ -34,7 +34,19 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 Generate release files
 --------
 
-Note: Release operation requires [Ant](http://ant.apache.org/) and [Maven](https://maven.apache.org/).
+### Deploy assembly jar file
+
+For plug-in development, we have to publish the GitBucket jar file to the Maven central repository before release GitBucket itself.
+ 
+First, hit following command to publish artifacts to the sonatype OSS repository:
+
+```bash
+$ sbt publishSigned
+```
+
+Then logged-in to https://oss.sonatype.org/, close and release the repository.
+
+You need to wait up to a day until [gitbucket-notification-plugin](https://plugins.gitbucket-community.org/) which is default bundled plugin is built for new version of GitBucket.
 
 ### Make release war file
 
@@ -44,11 +56,4 @@ Run `sbt executable`. The release war file and fingerprint are generated into `t
 $ sbt executable
 ```
 
-### Deploy assembly jar file
-
-For plug-in development, we have to publish the assembly jar file to the public Maven repository by `release/deploy-assembly-jar.sh`.
-
-```bash
-$ cd release/
-$ ./deploy-assembly-jar.sh
-```
+Create new release from the corresponded tag on GitHub, then upload generated jar file and fingerprints to the release.

doc/validation.md

@@ -1,11 +1,11 @@
 Mapping and Validation
 ========
-GitBucket uses [scalatra-forms](https://github.com/takezoe/scalatra-forms) to validate request parameters and map them to the scala object. This is inspired by Play2 form mapping / validation.
+GitBucket uses [scalatra-forms](http://scalatra.org/guides/2.6/formats/forms.html) to validate request parameters and map them to the scala object. This is inspired by Play2 form mapping / validation.
 
 At first, define the mapping as following:
 
 ```scala
-import jp.sf.amateras.scalatra.forms._
+import org.scalatra.forms._
 
 case class RegisterForm(name: String, description: String)
 
@@ -15,17 +15,17 @@ val form = mapping(
 )(RegisterForm.apply)
 ```
 
-The servlet have to mixed in ```jp.sf.amateras.scalatra.forms.ClientSideValidationFormSupport``` to validate request parameters and take mapped object. It validates request parameters before action. If any errors are detected, it throws an exception.
+The servlet have to mixed in `gitbucket.core.controller.ValidationFormSupport` to validate request parameters and take mapped object. It validates request parameters before action. If any errors are detected, it throws an exception.
 
 ```scala
-class RegisterServlet extends ScalatraServlet with ClientSideValidationFormSupport {
+class RegisterServlet extends ScalatraServlet with ValidationFormSupport {
   post("/register", form) { form: RegisterForm =>
     ...
   }
 }
 ```
 
-In the view template, you can add client-side validation by adding ```validate="true"``` to your form. Error messages are set to ```span#error-<fieldname>```.
+In the view template, you can add client-side validation by adding `validate="true"` to your form. Error messages are set to `span#error-<fieldname>`.
 
 ```html
 <form method="POST" action="/register" validate="true">
@@ -39,9 +39,9 @@ In the view template, you can add client-side validation by adding ```validate="
 </form>
 ```
 
-Client-side validation calls ```<form-action>/validate``` to validate form contents. It returns a validation result as JSON. In this case, form action is ```/register```, so ```/register/validate``` is called before submitting a form. ```ClientSideValidationFormSupport``` adds this JSON API automatically.
+Client-side validation calls `<form-action>/validate` to validate form contents. It returns a validation result as JSON. In this case, form action is `/register`, so `/register/validate` is called before submitting a form. `ValidationFormSupport` adds this JSON API automatically.
 
-For Ajax request, you have to use '''ajaxGet''' or '''ajaxPost''' to define action. It almost same as '''get''' or '''post'''. You can implement actions which handle Ajax request as same as normal actions.
+For Ajax request, you have to use `ajaxGet` or `ajaxPost` to define action. It almost same as '''get''' or '''post'''. You can implement actions which handle Ajax request as same as normal actions.
 Small difference is they return validation errors as JSON.
 
 ```scala

project/Checksums.scala

@@ -1,34 +1,36 @@
-import java.security.MessageDigest;
+import java.security.MessageDigest
 import scala.annotation._
 import sbt._
-import sbt.Using._
+import io._
 
 object Checksums {
   private val bufferSize = 2048
 
-  def generate(source:File, target:File, algorithm:String):Unit =
-      IO write (target, compute(source, algorithm))
+  def generate(source: File, target: File, algorithm: String): Unit =
+    sbt.IO write (target, compute(source, algorithm))
 
-  def compute(file:File, algorithm:String):String =
-      hex(raw(file, algorithm))
+  def compute(file: File, algorithm: String): String =
+    hex(raw(file, algorithm))
 
-  def raw(file:File, algorithm:String):Array[Byte]    =
-      (Using fileInputStream file) { is =>
-        val md  = MessageDigest getInstance algorithm
-        val buf = new Array[Byte](bufferSize)
-        md.reset()
-        @tailrec
-        def loop() {
-          val len = is read buf
-          if (len != -1) {
-            md update (buf, 0, len)
-            loop()
-          }
+  def raw(file: File, algorithm: String): Array[Byte] =
+    (Using fileInputStream file) { is =>
+      val md = MessageDigest getInstance algorithm
+      val buf = new Array[Byte](bufferSize)
+      md.reset()
+      @tailrec
+      def loop(): Unit = {
+        val len = is read buf
+        if (len != -1) {
+          md update (buf, 0, len)
+          loop()
         }
-        loop()
-        md.digest()
       }
+      loop()
+      md.digest()
+    }
 
-  def hex(bytes:Array[Byte]):String =
-      bytes map { it => "%02x" format (it.toInt & 0xff) } mkString ""
+  def hex(bytes: Array[Byte]): String =
+    bytes map { it =>
+      "%02x" format (it.toInt & 0xff)
+    } mkString ""
 }

project/PluginsJson.scala

@@ -0,0 +1,15 @@
+import com.eclipsesource.json.Json
+import scala.collection.JavaConverters._
+
+object PluginsJson {
+
+  def getUrls(json: String): Seq[String] = {
+    val value = Json.parse(json)
+    value.asArray.values.asScala.map { plugin =>
+      val pluginObject = plugin.asObject
+      val latestVersionObject = pluginObject.get("versions").asArray.asScala.head.asObject
+      latestVersionObject.get("url").asString
+    }
+  }
+
+}

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=1.5.5

project/build.sbt

@@ -0,0 +1 @@
+libraryDependencies += "com.eclipsesource.minimal-json" % "minimal-json" % "0.9.5"

project/plugins.sbt

@@ -1,6 +1,11 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"       % "1.0.4")
-addSbtPlugin("com.eed3si9n"     % "sbt-assembly"    % "0.12.0")
-addSbtPlugin("com.earldouglas"  % "xsbt-web-plugin" % "2.1.0")
-addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
+addSbtPlugin("org.scalameta"    % "sbt-scalafmt"       % "2.4.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"          % "1.5.1")
+addSbtPlugin("com.eed3si9n"     % "sbt-assembly"       % "1.1.0")
+addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra"       % "1.0.4")
+addSbtPlugin("com.github.sbt"   % "sbt-pgp"            % "2.1.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
+addSbtPlugin("org.scoverage"    % "sbt-scoverage"      % "1.9.2")
+
+addDependencyTreePlugin

release/deploy-assembly-jar.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-. ./env.sh
-
-cd ../
-./sbt.sh clean assembly
-
-cd release
-
-if [[ "$GITBUCKET_VERSION" =~ -SNAPSHOT$ ]]; then
-  MVN_DEPLOY_PATH=mvn-snapshot
-else
-  MVN_DEPLOY_PATH=mvn
-fi
-
-echo $MVN_DEPLOY_PATH
-
-mvn deploy:deploy-file \
-  -DgroupId=gitbucket\
-  -DartifactId=gitbucket-assembly\
-  -Dversion=$GITBUCKET_VERSION\
-  -Dpackaging=jar\
-  -Dfile=../target/scala-2.11/gitbucket-assembly-$GITBUCKET_VERSION.jar\
-  -DrepositoryId=sourceforge.jp\
-  -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/$MVN_DEPLOY_PATH/

release/env.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-export GITBUCKET_VERSION=`cat ../build.sbt | grep 'val GitBucketVersion' | cut -d \" -f 2`
-echo "GITBUCKET_VERSION: $GITBUCKET_VERSION"

release/pom.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>jp.sf.amateras</groupId>
-    <artifactId>gitbucket-assembly</artifactId>
-    <version>0.0.1</version>
-    <build>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh</artifactId>
-                <version>2.10</version>
-            </extension>
-        </extensions>
-    </build>
-</project>

sbt.bat

@@ -1,2 +0,0 @@
-set SCRIPT_DIR=%~dp0
-java %JAVA_OPTS% -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.9.jar" %*

sbt.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-java $JAVA_OPTS -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.9.jar "$@"

src/main/java/JettyLauncher.java

@@ -1,65 +1,233 @@
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.SecuredRedirectHandler;
+import org.eclipse.jetty.server.handler.StatisticsHandler;
+import org.eclipse.jetty.server.session.DefaultSessionCache;
+import org.eclipse.jetty.server.session.FileSessionDataStore;
+import org.eclipse.jetty.server.session.SessionCache;
+import org.eclipse.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
+import java.net.InetAddress;
 import java.net.URL;
 import java.security.ProtectionDomain;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toSet;
 
 public class JettyLauncher {
+
+    private interface Defaults {
+
+        String CONNECTORS = "http";
+        String HOST = "0.0.0.0";
+
+        int HTTP_PORT = 8080;
+        int HTTPS_PORT = 8443;
+
+        boolean REDIRECT_HTTPS = false;
+    }
+
+    private interface Connectors {
+
+        String HTTP = "http";
+        String HTTPS = "https";
+    }
+
     public static void main(String[] args) throws Exception {
-        String host = null;
-        int port = 8080;
-        String contextPath = "/";
-        boolean forceHttps = false;
+        System.setProperty("java.awt.headless", "true");
+
+        String connectors = getEnvironmentVariable("gitbucket.connectors");
+        String host = getEnvironmentVariable("gitbucket.host");
+        String port = getEnvironmentVariable("gitbucket.port");
+        String securePort = getEnvironmentVariable("gitbucket.securePort");
+        String keyStorePath = getEnvironmentVariable("gitbucket.keyStorePath");
+        String keyStorePassword = getEnvironmentVariable("gitbucket.keyStorePassword");
+        String keyManagerPassword = getEnvironmentVariable("gitbucket.keyManagerPassword");
+        String redirectHttps = getEnvironmentVariable("gitbucket.redirectHttps");
+        String contextPath = getEnvironmentVariable("gitbucket.prefix");
+        String tmpDirPath = getEnvironmentVariable("gitbucket.tempDir");
+        boolean saveSessions = false;
 
         for(String arg: args) {
+            if(arg.equals("--save_sessions")) {
+                saveSessions = true;
+            }
             if(arg.startsWith("--") && arg.contains("=")) {
-                String[] dim = arg.split("=");
-                if(dim.length >= 2) {
-                    if(dim[0].equals("--host")) {
-                        host = dim[1];
-                    } else if(dim[0].equals("--port")) {
-                        port = Integer.parseInt(dim[1]);
-                    } else if(dim[0].equals("--prefix")) {
-                        contextPath = dim[1];
-                    } else if(dim[0].equals("--gitbucket.home")){
-                        System.setProperty("gitbucket.home", dim[1]);
+                String[] dim = arg.split("=", 2);
+                if(dim.length == 2) {
+                    switch (dim[0]) {
+                        case "--connectors":
+                            connectors = dim[1];
+                            break;
+                        case "--host":
+                            host = dim[1];
+                            break;
+                        case "--port":
+                            port = dim[1];
+                            break;
+                        case "--secure_port":
+                            securePort = dim[1];
+                            break;
+                        case "--key_store_path":
+                            keyStorePath = dim[1];
+                            break;
+                        case "--key_store_password":
+                            keyStorePassword = dim[1];
+                            break;
+                        case "--key_manager_password":
+                            keyManagerPassword = dim[1];
+                            break;
+                        case "--redirect_https":
+                            redirectHttps = dim[1];
+                            break;
+                        case "--prefix":
+                            contextPath = dim[1];
+                            break;
+                        case "--gitbucket.home":
+                            System.setProperty("gitbucket.home", dim[1]);
+                            break;
+                        case "--temp_dir":
+                            tmpDirPath = dim[1];
+                            break;
+                        case "--plugin_dir":
+                            System.setProperty("gitbucket.pluginDir", dim[1]);
+                            break;
                     }
                 }
             }
         }
 
-        Server server = new Server(port);
+        if (contextPath != null && !contextPath.startsWith("/")) {
+            contextPath = "/" + contextPath;
+        }
 
-//        SelectChannelConnector connector = new SelectChannelConnector();
-//        if(host != null) {
-//            connector.setHost(host);
-//        }
-//        connector.setMaxIdleTime(1000 * 60 * 60);
-//        connector.setSoLingerTime(-1);
-//        connector.setPort(port);
-//        server.addConnector(connector);
+        final String hostName = InetAddress.getByName(fallback(host, Defaults.HOST)).getHostName();
+
+        final Server server = new Server();
+
+        final Set<String> connectorsSet = Stream.of(fallback(connectors, Defaults.CONNECTORS)
+            .toLowerCase().split(",")).map(String::trim).collect(toSet());
+
+        final List<ServerConnector> connectorInstances = new ArrayList<>();
+
+        final HttpConfiguration httpConfig = new HttpConfiguration();
+        httpConfig.setSendServerVersion(false);
+        if (connectorsSet.contains(Connectors.HTTPS)) {
+            httpConfig.setSecurePort(fallback(securePort, Defaults.HTTPS_PORT, Integer::parseInt));
+        }
+
+        if (connectorsSet.contains(Connectors.HTTP)) {
+            final ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
+            connector.setHost(hostName);
+            connector.setPort(fallback(port, Defaults.HTTP_PORT, Integer::parseInt));
+
+            connectorInstances.add(connector);
+        }
+
+        if (connectorsSet.contains(Connectors.HTTPS)) {
+            final SslContextFactory sslContextFactory = new SslContextFactory.Server();
+
+            sslContextFactory.setKeyStorePath(requireNonNull(keyStorePath,
+                "You must specify a path to an SSL keystore via the --key_store_path command line argument" +
+                    " or GITBUCKET_KEYSTOREPATH environment variable."));
+
+            sslContextFactory.setKeyStorePassword(requireNonNull(keyStorePassword,
+                "You must specify a an SSL keystore password via the --key_store_password argument" +
+                    " or GITBUCKET_KEYSTOREPASSWORD environment variable."));
+
+            sslContextFactory.setKeyManagerPassword(requireNonNull(keyManagerPassword,
+                "You must specify a key manager password via the --key_manager_password' argument" +
+                    " or GITBUCKET_KEYMANAGERPASSWORD environment variable."));
+
+            final HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
+            httpsConfig.addCustomizer(new SecureRequestCustomizer());
+
+            final ServerConnector connector = new ServerConnector(server,
+                new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()),
+                new HttpConnectionFactory(httpsConfig));
+
+            connector.setHost(hostName);
+            connector.setPort(fallback(securePort, Defaults.HTTPS_PORT, Integer::parseInt));
+
+            connectorInstances.add(connector);
+        }
+
+        require(!connectorInstances.isEmpty(),
+            "No server connectors could be configured, please check your --connectors command line argument" +
+                " or GITBUCKET_CONNECTORS environment variable.");
+
+        server.setConnectors(connectorInstances.toArray(new ServerConnector[0]));
 
         WebAppContext context = new WebAppContext();
 
-        File tmpDir = new File(getGitBucketHome(), "tmp");
-        if(!tmpDir.exists()){
-            tmpDir.mkdirs();
+        if(saveSessions) {
+            File sessDir = new File(getGitBucketHome(), "sessions");
+            if(!sessDir.exists()){
+                mkdir(sessDir);
+            }
+            SessionHandler sessions = context.getSessionHandler();
+            SessionCache cache = new DefaultSessionCache(sessions);
+            FileSessionDataStore fsds = new FileSessionDataStore();
+            fsds.setStoreDir(sessDir);
+            cache.setSessionDataStore(fsds);
+            sessions.setSessionCache(cache);
+        }
+
+        File tmpDir;
+        if(tmpDirPath == null || tmpDirPath.equals("")){
+            tmpDir = new File(getGitBucketHome(), "tmp");
+            if(!tmpDir.exists()){
+                mkdir(tmpDir);
+            }
+        } else {
+            tmpDir = new File(tmpDirPath);
+            if(!tmpDir.exists()){
+                throw new java.io.FileNotFoundException(
+                    String.format("temp_dir \"%s\" not found", tmpDirPath));
+            } else if(!tmpDir.isDirectory()) {
+                throw new IllegalArgumentException(
+                    String.format("temp_dir \"%s\" is not a directory", tmpDirPath));
+            }
         }
         context.setTempDirectory(tmpDir);
 
+        // Disabling the directory listing feature.
+        context.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
+
         ProtectionDomain domain = JettyLauncher.class.getProtectionDomain();
         URL location = domain.getCodeSource().getLocation();
 
-        context.setContextPath(contextPath);
+        context.setContextPath(contextPath == null ? "" : contextPath);
         context.setDescriptor(location.toExternalForm() + "/WEB-INF/web.xml");
         context.setServer(server);
         context.setWar(location.toExternalForm());
-        if (forceHttps) {
-            context.setInitParameter("org.scalatra.ForceHttps", "true");
+
+        final HandlerList handlers = new HandlerList();
+
+        if (fallback(redirectHttps, Defaults.REDIRECT_HTTPS, Boolean::parseBoolean)) {
+            handlers.addHandler(new SecuredRedirectHandler());
         }
 
-        server.setHandler(context);
+        handlers.addHandler(addStatisticsHandler(context));
+
+        server.setHandler(handlers);
+        server.setStopAtShutdown(true);
+        server.setStopTimeout(7_000);
         server.start();
         server.join();
     }
@@ -76,14 +244,45 @@ public class JettyLauncher {
         return new File(System.getProperty("user.home"), ".gitbucket");
     }
 
-    private static void deleteDirectory(File dir){
-        for(File file: dir.listFiles()){
-            if(file.isFile()){
-                file.delete();
-            } else if(file.isDirectory()){
-                deleteDirectory(file);
-            }
+    private static String getEnvironmentVariable(String key){
+        String value =  System.getenv(key.toUpperCase().replace('.', '_'));
+        if (value != null && value.length() == 0){
+            return null;
+        } else {
+            return value;
         }
-        dir.delete();
+    }
+
+    private static <T, R> T fallback(R value, T defaultValue, Function<R, T> converter) {
+        return value == null ? defaultValue : converter.apply(value);
+    }
+
+    private static <T> T fallback(T value, T defaultValue) {
+        return fallback(value, defaultValue, identity());
+    }
+
+    private static void require(boolean condition, String message) {
+        if (!condition) {
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    private static <T> T requireNonNull(T value, String message) {
+        require(value != null, message);
+        return value;
+    }
+
+    private static void mkdir(File dir) {
+        if (!dir.mkdirs()) {
+            throw new RuntimeException("Unable to create directory: " + dir);
+        }
+    }
+
+    private static Handler addStatisticsHandler(Handler handler) {
+        // The graceful shutdown is implemented via the statistics handler.
+        // See the following: https://bugs.eclipse.org/bugs/show_bug.cgi?id=420142
+        final StatisticsHandler statisticsHandler = new StatisticsHandler();
+        statisticsHandler.setHandler(handler);
+        return statisticsHandler;
     }
 }

src/main/java/gitbucket/core/util/PatchUtil.java

@@ -20,15 +20,15 @@ public class PatchUtil {
     public static String apply(String source, String patch, FileHeader fh)
             throws IOException, PatchApplyException {
         RawText rt = new RawText(source.getBytes("UTF-8"));
-        List<String> oldLines = new ArrayList<String>(rt.size());
+        List<String> oldLines = new ArrayList<>(rt.size());
         for (int i = 0; i < rt.size(); i++)
             oldLines.add(rt.getString(i));
-        List<String> newLines = new ArrayList<String>(oldLines);
+        List<String> newLines = new ArrayList<>(oldLines);
         for (HunkHeader hh : fh.getHunks()) {
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             out.write(patch.getBytes("UTF-8"), hh.getStartOffset(), hh.getEndOffset() - hh.getStartOffset());
             RawText hrt = new RawText(out.toByteArray());
-            List<String> hunkLines = new ArrayList<String>(hrt.size());
+            List<String> hunkLines = new ArrayList<>(hrt.size());
             for (int i = 0; i < hrt.size(); i++)
                 hunkLines.add(hrt.getString(i));
             int pos = 0;

src/main/resources/bundle-plugins.txt

@@ -0,0 +1,4 @@
+notifications:1.10.0
+gist:4.21.0
+emoji:4.6.0
+pages:1.10.0

src/main/resources/update/gitbucket-core_4.0.xml

@@ -60,13 +60,12 @@
   <!-- ACCESS_TOKEN -->
   <!--================================================================================================-->
   <createTable tableName="ACCESS_TOKEN">
-    <column name="ACCESS_TOKEN_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="ACCESS_TOKEN_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_ACCESS_TOKEN_PK" primaryKey="true" />
     <column name="TOKEN_HASH" type="varchar(40)" nullable="false"/>
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="NOTE" type="text" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_ACCESS_TOKEN_PK" tableName="ACCESS_TOKEN" columnNames="ACCESS_TOKEN_ID"/>
   <addUniqueConstraint constraintName="IDX_ACCESS_TOKEN_TOKEN_HASH" tableName="ACCESS_TOKEN" columnNames="TOKEN_HASH"/>
   <addForeignKeyConstraint constraintName="IDX_ACCESS_TOKEN_FK0" baseTableName="ACCESS_TOKEN" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
 
@@ -74,7 +73,7 @@
   <!-- ACTIVITY -->
   <!--================================================================================================-->
   <createTable tableName="ACTIVITY">
-    <column name="ACTIVITY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="ACTIVITY_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_ACTIVITY_PK" primaryKey="true"/>
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
     <column name="ACTIVITY_USER_NAME" type="varchar(100)" nullable="false"/>
@@ -84,7 +83,6 @@
     <column name="ACTIVITY_DATE" type="datetime" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_ACTIVITY_PK" tableName="ACTIVITY" columnNames="ACTIVITY_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ACTIVITY_FK1" baseTableName="ACTIVITY" baseColumnNames="ACTIVITY_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
   <addForeignKeyConstraint constraintName="IDX_ACTIVITY_FK0" baseTableName="ACTIVITY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
 
@@ -108,7 +106,7 @@
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
     <column name="COMMIT_ID" type="varchar(100)" nullable="false"/>
-    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_COMMIT_COMMENT_PK" primaryKey="true" />
     <column name="COMMENTED_USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="CONTENT" type="text" nullable="false"/>
     <column name="FILE_NAME" type="varchar(260)" nullable="true"/>
@@ -119,14 +117,13 @@
     <column name="ISSUE_ID" type="int" nullable="true"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_COMMIT_COMMENT_PK" tableName="COMMIT_COMMENT" columnNames="COMMENT_ID"/>
   <addForeignKeyConstraint constraintName="IDX_COMMIT_COMMENT_FK0" baseTableName="COMMIT_COMMENT" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
 
   <!--================================================================================================-->
   <!-- COMMIT_STATUS -->
   <!--================================================================================================-->
   <createTable tableName="COMMIT_STATUS">
-    <column name="COMMIT_STATUS_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="COMMIT_STATUS_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_COMMIT_STATUS_PK" primaryKey="true" />
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
     <column name="COMMIT_ID" type="varchar(40)" nullable="false"/>
@@ -139,7 +136,6 @@
     <column name="UPDATED_DATE" type="datetime" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_COMMIT_STATUS_PK" tableName="COMMIT_STATUS" columnNames="COMMIT_STATUS_ID"/>
   <addUniqueConstraint constraintName="IDX_COMMIT_STATUS_1" tableName="COMMIT_STATUS" columnNames="USER_NAME, REPOSITORY_NAME, COMMIT_ID, CONTEXT"/>
   <addForeignKeyConstraint constraintName="IDX_COMMIT_STATUS_FK3" baseTableName="COMMIT_STATUS" baseColumnNames="CREATOR" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
   <addForeignKeyConstraint constraintName="IDX_COMMIT_STATUS_FK2" baseTableName="COMMIT_STATUS" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
@@ -206,7 +202,7 @@
     <column name="PULL_REQUEST" type="boolean" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_ISSUE_PK" tableName="ISSUE" columnNames="ISSUE_ID, USER_NAME, REPOSITORY_NAME"/>
+  <addPrimaryKey constraintName="IDX_ISSUE_PK" tableName="ISSUE" columnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK0" baseTableName="ISSUE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK2" baseTableName="ISSUE" baseColumnNames="MILESTONE_ID" referencedTableName="MILESTONE" referencedColumnNames="MILESTONE_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK1" baseTableName="ISSUE" baseColumnNames="OPENED_USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
@@ -218,7 +214,7 @@
     <column name="USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
     <column name="ISSUE_ID" type="int" nullable="false"/>
-    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="COMMENT_ID" type="int" nullable="false" autoIncrement="true" unique="true" primaryKeyName="IDX_ISSUE_COMMENT_PK" primaryKey="true" />
     <column name="ACTION" type="varchar(20)" nullable="false"/>
     <column name="COMMENTED_USER_NAME" type="varchar(100)" nullable="false"/>
     <column name="CONTENT" type="text" nullable="false"/>
@@ -226,7 +222,6 @@
     <column name="UPDATED_DATE" type="datetime" nullable="false"/>
   </createTable>
 
-  <addPrimaryKey constraintName="IDX_ISSUE_COMMENT_PK" tableName="ISSUE_COMMENT" columnNames="COMMENT_ID"/>
   <addForeignKeyConstraint constraintName="IDX_ISSUE_COMMENT_FK0" baseTableName="ISSUE_COMMENT" baseColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID" referencedTableName="ISSUE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, ISSUE_ID"/>
 
   <!--================================================================================================-->
@@ -348,4 +343,4 @@
   <addPrimaryKey constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK" tableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" columnNames="USER_NAME, REPOSITORY_NAME, BRANCH, CONTEXT"/>
   <addForeignKeyConstraint constraintName="IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0" baseTableName="PROTECTED_BRANCH_REQUIRE_CONTEXT" baseColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" referencedTableName="PROTECTED_BRANCH" referencedColumnNames="USER_NAME, REPOSITORY_NAME, BRANCH" onDelete="CASCADE" onUpdate="CASCADE"/>
 
-</changeSet>
+</changeSet>

src/main/resources/update/gitbucket-core_4.11.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <createTable tableName="DEPLOY_KEY">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="DEPLOY_KEY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="TITLE" type="varchar(100)" nullable="false"/>
+    <column name="PUBLIC_KEY" type="text" nullable="false"/>
+    <column name="ALLOW_WRITE" type="boolean" nullable="false" defaultValueBoolean="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_DEPLOY_KEY_PK" tableName="DEPLOY_KEY" columnNames="USER_NAME, REPOSITORY_NAME, DEPLOY_KEY_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_DEPLOY_KEY_FK0" baseTableName="DEPLOY_KEY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.14.sql

@@ -0,0 +1,26 @@
+CREATE OR REPLACE VIEW ISSUE_OUTLINE_VIEW AS
+
+ SELECT
+   A.USER_NAME,
+   A.REPOSITORY_NAME,
+   A.ISSUE_ID,
+   COALESCE(B.COMMENT_COUNT, 0) + COALESCE(C.COMMENT_COUNT, 0) AS COMMENT_COUNT,
+   COALESCE(D.ORDERING, 9999) AS PRIORITY
+
+ FROM ISSUE A
+
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM ISSUE_COMMENT
+   WHERE ACTION IN ('comment', 'close_comment', 'reopen_comment')
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) B
+ ON (A.USER_NAME = B.USER_NAME AND A.REPOSITORY_NAME = B.REPOSITORY_NAME AND A.ISSUE_ID = B.ISSUE_ID)
+
+ LEFT OUTER JOIN (
+   SELECT USER_NAME, REPOSITORY_NAME, ISSUE_ID, COUNT(COMMENT_ID) AS COMMENT_COUNT FROM COMMIT_COMMENT
+   GROUP BY USER_NAME, REPOSITORY_NAME, ISSUE_ID
+ ) C
+ ON (A.USER_NAME = C.USER_NAME AND A.REPOSITORY_NAME = C.REPOSITORY_NAME AND A.ISSUE_ID = C.ISSUE_ID)
+
+ LEFT OUTER JOIN PRIORITY D
+ ON (A.PRIORITY_ID = D.PRIORITY_ID);

src/main/resources/update/gitbucket-core_4.14.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <createTable tableName="PRIORITY">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="PRIORITY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="PRIORITY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="DESCRIPTION" type="varchar(255)" nullable="true"/>
+    <column name="ORDERING" type="int" nullable="false"/>
+    <column name="IS_DEFAULT" type="boolean" nullable="false"/>
+    <column name="COLOR" type="char(6)" nullable="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_PRIORITY_PK" tableName="PRIORITY" columnNames="USER_NAME, REPOSITORY_NAME, PRIORITY_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_PRIORITY_FK0" baseTableName="PRIORITY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+
+  <addColumn tableName="ISSUE">
+    <column name="PRIORITY_ID" type="int" nullable="true" />
+  </addColumn>
+
+  <addForeignKeyConstraint constraintName="IDX_ISSUE_FK3" baseTableName="ISSUE" baseColumnNames="PRIORITY_ID" referencedTableName="PRIORITY" referencedColumnNames="PRIORITY_ID"/>
+
+  <createTable tableName="ACCOUNT_WEB_HOOK">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="URL" type="varchar(200)" nullable="false"/>
+    <column name="TOKEN" type="varchar(100)" nullable="true"/>
+    <column name="CTYPE" type="varchar(10)" nullable="true"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_ACCOUNT_WEB_HOOK_PK" tableName="ACCOUNT_WEB_HOOK" columnNames="USER_NAME, URL"/>
+  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_WEB_HOOK_FK0" baseTableName="ACCOUNT_WEB_HOOK" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
+
+  <createTable tableName="ACCOUNT_WEB_HOOK_EVENT">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="URL" type="varchar(200)" nullable="false"/>
+    <column name="EVENT" type="varchar(30)" nullable="false"/>
+  </createTable>
+</changeSet>

src/main/resources/update/gitbucket-core_4.21.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <createTable tableName="RELEASE">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="TAG" type="varchar(100)" nullable="false"/>
+    <column name="NAME" type="varchar(100)" nullable="false"/>
+    <column name="AUTHOR" type="varchar(100)" nullable="false"/>
+    <column name="CONTENT" type="text" nullable="true"/>
+    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
+    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_RELEASE_PK" tableName="RELEASE" columnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
+  <addForeignKeyConstraint constraintName="IDX_RELEASE_FK0" baseTableName="RELEASE" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+
+  <createTable tableName="RELEASE_ASSET">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="TAG" type="varchar(100)" nullable="false"/>
+    <column name="RELEASE_ASSET_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="FILE_NAME" type="varchar(260)" nullable="false"/>
+    <column name="LABEL" type="varchar(100)" nullable="true"/>
+    <column name="SIZE" type="bigint" nullable="false"/>
+    <column name="UPLOADER" type="varchar(100)" nullable="false"/>
+    <column name="REGISTERED_DATE" type="datetime" nullable="false"/>
+    <column name="UPDATED_DATE" type="datetime" nullable="false"/>
+  </createTable>
+  <addPrimaryKey constraintName="IDX_RELEASE_ASSET_PK" tableName="RELEASE_ASSET" columnNames="USER_NAME, REPOSITORY_NAME, TAG, FILE_NAME"/>
+  <addForeignKeyConstraint constraintName="IDX_RELEASE_ASSET_FK1" baseTableName="RELEASE_ASSET" baseColumnNames="USER_NAME, REPOSITORY_NAME, TAG" referencedTableName="RELEASE" referencedColumnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
+
+  <createTable tableName="ACCOUNT_FEDERATION">
+    <column name="ISSUER" type="varchar(100)" nullable="false"/>
+    <column name="SUBJECT" type="varchar(100)" nullable="false"/>
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+  </createTable>
+  <addPrimaryKey constraintName="IDX_ACCOUNT_FEDERATION_PK" tableName="ACCOUNT_FEDERATION" columnNames="ISSUER, SUBJECT"/>
+  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_FEDERATION_FK0" baseTableName="ACCOUNT_FEDERATION" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.22.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="REPOSITORY">
+    <column name="MERGE_OPTIONS" type="varchar(200)" nullable="false" defaultValue="merge-commit,squash,rebase"/>
+    <column name="DEFAULT_MERGE_OPTION" type="varchar(100)" nullable="false" defaultValue="merge-commit"/>
+  </addColumn>
+</changeSet>

src/main/resources/update/gitbucket-core_4.23.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <dropForeignKeyConstraint baseTableName="RELEASE_ASSET" constraintName="IDX_RELEASE_ASSET_FK1"/>
+
+  <dropForeignKeyConstraint baseTableName="RELEASE" constraintName="IDX_RELEASE_FK0"/>
+  <dropPrimaryKey tableName="RELEASE" constraintName="IDX_RELEASE_PK"/>
+
+  <renameTable newTableName="RELEASE_TAG" oldTableName="RELEASE" />
+
+  <addPrimaryKey constraintName="IDX_RELEASE_TAG_PK" tableName="RELEASE_TAG" columnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
+  <addForeignKeyConstraint constraintName="IDX_RELEASE_TAG_FK0" baseTableName="RELEASE_TAG" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+
+  <addForeignKeyConstraint constraintName="IDX_RELEASE_ASSET_FK0" baseTableName="RELEASE_ASSET" baseColumnNames="USER_NAME, REPOSITORY_NAME, TAG" referencedTableName="RELEASE_TAG" referencedColumnNames="USER_NAME, REPOSITORY_NAME, TAG"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.24.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <createTable tableName="ACCOUNT_EXTRA_MAIL_ADDRESS">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="EXTRA_MAIL_ADDRESS" type="varchar(100)" nullable="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_ACCOUNT_EXTRA_MAIL_ADDRESS_PK" tableName="ACCOUNT_EXTRA_MAIL_ADDRESS" columnNames="USER_NAME, EXTRA_MAIL_ADDRESS"/>
+  <addUniqueConstraint constraintName="IDX_ACCOUNT_EXTRA_MAIL_ADDRESS_1" tableName="ACCOUNT_EXTRA_MAIL_ADDRESS" columnNames="EXTRA_MAIL_ADDRESS"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.25.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <modifyDataType columnName="PASSWORD" newDataType="varchar(200)" tableName="ACCOUNT"/>
+
+  <delete tableName="ACCOUNT_EXTRA_MAIL_ADDRESS">
+    <where>EXTRA_MAIL_ADDRESS = ''</where>
+  </delete>
+</changeSet>

src/main/resources/update/gitbucket-core_4.27.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="COMMIT_COMMENT">
+    <column name="ORIGINAL_COMMIT_ID" type="varchar(100)" nullable="true"/>
+    <column name="ORIGINAL_OLD_LINE" type="int" nullable="true"/>
+    <column name="ORIGINAL_NEW_LINE" type="int" nullable="true"/>
+  </addColumn>
+  <update tableName="COMMIT_COMMENT">
+    <column name="ORIGINAL_COMMIT_ID" valueComputed="COMMIT_ID"/>
+    <column name="ORIGINAL_OLD_LINE" valueComputed="OLD_LINE_NUMBER"/>
+    <column name="ORIGINAL_NEW_LINE" valueComputed="NEW_LINE_NUMBER"/>
+  </update>
+  <addNotNullConstraint columnName="ORIGINAL_COMMIT_ID" tableName="COMMIT_COMMENT" columnDataType="varchar(100)"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.31.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <!--================================================================================================-->
+  <!-- SSH_KEY -->
+  <!--================================================================================================-->
+  <createTable tableName="GPG_KEY">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="KEY_ID" type="int" nullable="false" autoIncrement="true" unique="true"/>
+    <column name="GPG_KEY_ID" type="bigint" nullable="false"/>
+    <column name="TITLE" type="varchar(100)" nullable="false"/>
+    <column name="PUBLIC_KEY" type="text" nullable="false"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_GPG_KEY_PK" tableName="GPG_KEY" columnNames="USER_NAME, GPG_KEY_ID"/>
+  <addForeignKeyConstraint constraintName="IDX_GPG_KEY_FK0" baseTableName="GPG_KEY" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.32.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="PULL_REQUEST">
+    <column name="IS_DRAFT" type="boolean" nullable="false" defaultValueBoolean="false" />
+  </addColumn>
+</changeSet>

src/main/resources/update/gitbucket-core_4.34.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <dropTable tableName="ACTIVITY" />
+</changeSet>

src/main/resources/update/gitbucket-core_4.35.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <!--================================================================================================-->
+  <!-- WEB_HOOK -->
+  <!--================================================================================================-->
+  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT"/>
+  <dropForeignKeyConstraint constraintName="IDX_WEB_HOOK_FK0" baseTableName="WEB_HOOK"/>
+  <dropPrimaryKey constraintName="IDX_WEB_HOOK_PK" tableName="WEB_HOOK"/>
+  
+  <createTable tableName="WEB_HOOK_2">
+    <column name="HOOK_ID" type="int" nullable="true" autoIncrement="true" unique="false" primaryKeyName="IDX_WEB_HOOK_PK" primaryKey="true" />
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="REPOSITORY_NAME" type="varchar(100)" nullable="false"/>
+    <column name="URL" type="varchar(200)" nullable="false"/>
+    <column name="TOKEN" type="varchar(100)" nullable="true"/>
+    <column name="CTYPE" type="varchar(10)" nullable="true"/>
+  </createTable>
+
+  <sql>
+    INSERT INTO WEB_HOOK_2 (USER_NAME, REPOSITORY_NAME, URL, TOKEN, CTYPE) SELECT USER_NAME, REPOSITORY_NAME, URL, TOKEN, CTYPE FROM WEB_HOOK
+  </sql>
+
+  <renameTable newTableName="WEB_HOOK_BK" oldTableName="WEB_HOOK"/>
+  <renameTable newTableName="WEB_HOOK" oldTableName="WEB_HOOK_2"/>
+
+  <addUniqueConstraint constraintName="IDX_WEB_HOOK_1" tableName="WEB_HOOK" columnNames="USER_NAME, REPOSITORY_NAME, URL"/>
+  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_FK0" baseTableName="WEB_HOOK" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
+  <addForeignKeyConstraint constraintName="IDX_WEB_HOOK_EVENT_FK0" baseTableName="WEB_HOOK_EVENT" baseColumnNames="USER_NAME, REPOSITORY_NAME, URL" referencedTableName="WEB_HOOK" referencedColumnNames="USER_NAME, REPOSITORY_NAME, URL" onDelete="CASCADE" onUpdate="CASCADE"/>
+
+  <!--================================================================================================-->
+  <!-- ACCOUNT_PREFERENCE -->
+  <!--================================================================================================-->
+  <createTable tableName="ACCOUNT_PREFERENCE">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="HIGHLIGHTER_THEME" type="varchar(100)" nullable="false" defaultValue="prettify"/>
+  </createTable>
+  <addPrimaryKey constraintName="IDX_ACCOUNT_PREFERENCE_PK" tableName="ACCOUNT_PREFERENCE" columnNames="USER_NAME"/>
+  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_PREFERENCE_FK0" baseTableName="ACCOUNT_PREFERENCE" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME" onDelete="CASCADE" onUpdate="CASCADE"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.36.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="REPOSITORY">
+    <column name="SAFE_MODE" type="boolean" nullable="false" defaultValue="true"/>
+  </addColumn>
+</changeSet>

src/main/resources/update/gitbucket-core_4.6.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+    <addColumn tableName="REPOSITORY">
+        <column name="ALLOW_FORK" type="boolean" nullable="false" defaultValueBoolean="true"/>
+    </addColumn>
+</changeSet>

src/main/resources/update/gitbucket-core_4.7.sql

@@ -0,0 +1,2 @@
+-- DELETE COLLABORATORS IN GROUP REPOSITORIES
+DELETE FROM COLLABORATOR WHERE USER_NAME IN (SELECT USER_NAME FROM ACCOUNT WHERE GROUP_ACCOUNT = TRUE)

src/main/resources/update/gitbucket-core_4.7.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+    <addColumn tableName="COLLABORATOR">
+        <column name="ROLE" type="varchar(10)" nullable="false" defaultValue="ADMIN"/>
+    </addColumn>
+    <addColumn tableName="REPOSITORY">
+        <column name="WIKI_OPTION" type="varchar(10)" nullable="false" defaultValue="DISABLE"/>
+        <column name="ISSUES_OPTION" type="varchar(10)" nullable="false" defaultValue="DISABLE"/>
+    </addColumn>
+    <update tableName="REPOSITORY">
+        <column name="WIKI_OPTION" value="DISABLE"/>
+        <where>ENABLE_WIKI = FALSE</where>
+    </update>
+    <update tableName="REPOSITORY">
+        <column name="WIKI_OPTION" value="PRIVATE"/>
+        <where>ENABLE_WIKI = TRUE AND ALLOW_WIKI_EDITING = FALSE</where>
+    </update>
+    <update tableName="REPOSITORY">
+        <column name="WIKI_OPTION" value="PUBLIC"/>
+        <where>ENABLE_WIKI = TRUE AND ALLOW_WIKI_EDITING = TRUE</where>
+    </update>
+    <update tableName="REPOSITORY">
+        <column name="ISSUES_OPTION" value="DISABLE"/>
+        <where>ENABLE_ISSUES = FALSE</where>
+    </update>
+    <update tableName="REPOSITORY">
+        <column name="ISSUES_OPTION" value="PUBLIC"/>
+        <where>ENABLE_ISSUES = TRUE</where>
+    </update>
+    <dropColumn tableName="REPOSITORY" columnName="ENABLE_WIKI"/>
+    <dropColumn tableName="REPOSITORY" columnName="ALLOW_WIKI_EDITING"/>
+    <dropColumn tableName="REPOSITORY" columnName="ENABLE_ISSUES"/>
+</changeSet>

src/main/resources/update/gitbucket-core_4.9.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="ACCOUNT">
+    <column name="DESCRIPTION" type="text" nullable="true" />
+  </addColumn>
+</changeSet>

src/main/scala/ScalatraBootstrap.scala

@@ -1,48 +1,68 @@
-
-import gitbucket.core.controller._
-import gitbucket.core.plugin.PluginRegistry
-import gitbucket.core.servlet.{ApiAuthenticationFilter, GitAuthenticationFilter, Database, TransactionFilter}
-import gitbucket.core.util.Directory
-
 import java.util.EnumSet
 import javax.servlet._
 
+import gitbucket.core.controller.{ReleaseController, _}
+import gitbucket.core.service.SystemSettingsService
+import gitbucket.core.servlet._
+import gitbucket.core.util.Directory
 import org.scalatra._
 
+class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
+  override def init(context: ServletContext): Unit = {
 
-class ScalatraBootstrap extends LifeCycle {
-  override def init(context: ServletContext) {
-    // Register TransactionFilter and BasicAuthenticationFilter at first
-    context.addFilter("transactionFilter", new TransactionFilter)
-    context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
-    context.addFilter("gitAuthenticationFilter", new GitAuthenticationFilter)
-    context.getFilterRegistration("gitAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
-    context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
-    context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
-    // Register controllers
-    context.mount(new AnonymousAccessController, "/*")
-
-    PluginRegistry().getControllers.foreach { case (controller, path) =>
-      context.mount(controller, path)
+    val settings = loadSystemSettings()
+    if (settings.baseUrl.exists(_.startsWith("https://"))) {
+      context.getSessionCookieConfig.setSecure(true)
     }
 
-    context.mount(new IndexController, "/")
-    context.mount(new ApiController, "/api/v3")
+    // Register TransactionFilter at first
+    context.addFilter("transactionFilter", new TransactionFilter)
+    context
+      .getFilterRegistration("transactionFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context.addFilter("gitAuthenticationFilter", new GitAuthenticationFilter)
+    context
+      .getFilterRegistration("gitAuthenticationFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
+    context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
+    context
+      .getFilterRegistration("apiAuthenticationFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/*")
+
+    // Register controllers
+    context.mount(new PreProcessController, "/*")
+
+    context.addFilter("pluginControllerFilter", new PluginControllerFilter)
+    context
+      .getFilterRegistration("pluginControllerFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+
     context.mount(new FileUploadController, "/upload")
-    context.mount(new SystemSettingsController, "/admin")
-    context.mount(new DashboardController, "/*")
-    context.mount(new AccountController, "/*")
-    context.mount(new RepositoryViewerController, "/*")
-    context.mount(new WikiController, "/*")
-    context.mount(new LabelsController, "/*")
-    context.mount(new MilestonesController, "/*")
-    context.mount(new IssuesController, "/*")
-    context.mount(new PullRequestsController, "/*")
-    context.mount(new RepositorySettingsController, "/*")
+
+    val filter = new CompositeScalatraFilter()
+    filter.mount(new IndexController, "/")
+    filter.mount(new ApiController, "/api/v3")
+    filter.mount(new SystemSettingsController, "/admin")
+    filter.mount(new DashboardController, "/*")
+    filter.mount(new AccountController, "/*")
+    filter.mount(new RepositoryViewerController, "/*")
+    filter.mount(new WikiController, "/*")
+    filter.mount(new LabelsController, "/*")
+    filter.mount(new PrioritiesController, "/*")
+    filter.mount(new MilestonesController, "/*")
+    filter.mount(new IssuesController, "/*")
+    filter.mount(new PullRequestsController, "/*")
+    filter.mount(new ReleaseController, "/*")
+    filter.mount(new RepositorySettingsController, "/*")
+
+    context.addFilter("compositeScalatraFilter", filter)
+    context
+      .getFilterRegistration("compositeScalatraFilter")
+      .addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
 
     // Create GITBUCKET_HOME directory if it does not exist
     val dir = new java.io.File(Directory.GitBucketHome)
-    if(!dir.exists){
+    if (!dir.exists) {
       dir.mkdirs()
     }
   }

src/main/scala/gitbucket/core/GitBucketCoreModule.scala

@@ -1,17 +1,123 @@
 package gitbucket.core
 
-import io.github.gitbucket.solidbase.migration.{SqlMigration, LiquibaseMigration}
-import io.github.gitbucket.solidbase.model.{Version, Module}
+import java.io.FileOutputStream
+import java.nio.charset.StandardCharsets
+import java.sql.Connection
+import java.util.UUID
 
-object GitBucketCoreModule extends Module("gitbucket-core",
-  new Version("4.0.0",
-    new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
-    new SqlMigration("update/gitbucket-core_4.0.sql")
-  ),
-  new Version("4.1.0"),
-  new Version("4.2.0",
-    new LiquibaseMigration("update/gitbucket-core_4.2.xml")
-  ),
-  new Version("4.2.1"),
-  new Version("4.3.0")
-)
+import gitbucket.core.model.Activity
+import gitbucket.core.util.Directory.ActivityLog
+import gitbucket.core.util.JDBCUtil
+import io.github.gitbucket.solidbase.Solidbase
+import io.github.gitbucket.solidbase.migration.{LiquibaseMigration, Migration, SqlMigration}
+import io.github.gitbucket.solidbase.model.{Module, Version}
+import org.json4s.{Formats, NoTypeHints}
+import org.json4s.jackson.Serialization
+import org.json4s.jackson.Serialization.write
+
+import scala.util.Using
+
+object GitBucketCoreModule
+    extends Module(
+      "gitbucket-core",
+      new Version(
+        "4.0.0",
+        new LiquibaseMigration("update/gitbucket-core_4.0.xml"),
+        new SqlMigration("update/gitbucket-core_4.0.sql")
+      ),
+      new Version("4.1.0"),
+      new Version("4.2.0", new LiquibaseMigration("update/gitbucket-core_4.2.xml")),
+      new Version("4.2.1"),
+      new Version("4.3.0"),
+      new Version("4.4.0"),
+      new Version("4.5.0"),
+      new Version("4.6.0", new LiquibaseMigration("update/gitbucket-core_4.6.xml")),
+      new Version(
+        "4.7.0",
+        new LiquibaseMigration("update/gitbucket-core_4.7.xml"),
+        new SqlMigration("update/gitbucket-core_4.7.sql")
+      ),
+      new Version("4.7.1"),
+      new Version("4.8"),
+      new Version("4.9.0", new LiquibaseMigration("update/gitbucket-core_4.9.xml")),
+      new Version("4.10.0"),
+      new Version("4.11.0", new LiquibaseMigration("update/gitbucket-core_4.11.xml")),
+      new Version("4.12.0"),
+      new Version("4.12.1"),
+      new Version("4.13.0"),
+      new Version(
+        "4.14.0",
+        new LiquibaseMigration("update/gitbucket-core_4.14.xml"),
+        new SqlMigration("update/gitbucket-core_4.14.sql")
+      ),
+      new Version("4.14.1"),
+      new Version("4.15.0"),
+      new Version("4.16.0"),
+      new Version("4.17.0"),
+      new Version("4.18.0"),
+      new Version("4.19.0"),
+      new Version("4.19.1"),
+      new Version("4.19.2"),
+      new Version("4.19.3"),
+      new Version("4.20.0"),
+      new Version("4.21.0", new LiquibaseMigration("update/gitbucket-core_4.21.xml")),
+      new Version("4.21.1"),
+      new Version("4.21.2"),
+      new Version("4.22.0", new LiquibaseMigration("update/gitbucket-core_4.22.xml")),
+      new Version("4.23.0", new LiquibaseMigration("update/gitbucket-core_4.23.xml")),
+      new Version("4.23.1"),
+      new Version("4.24.0", new LiquibaseMigration("update/gitbucket-core_4.24.xml")),
+      new Version("4.24.1"),
+      new Version("4.25.0", new LiquibaseMigration("update/gitbucket-core_4.25.xml")),
+      new Version("4.26.0"),
+      new Version("4.27.0", new LiquibaseMigration("update/gitbucket-core_4.27.xml")),
+      new Version("4.28.0"),
+      new Version("4.29.0"),
+      new Version("4.30.0"),
+      new Version("4.30.1"),
+      new Version("4.31.0", new LiquibaseMigration("update/gitbucket-core_4.31.xml")),
+      new Version("4.31.1"),
+      new Version("4.31.2"),
+      new Version("4.32.0", new LiquibaseMigration("update/gitbucket-core_4.32.xml")),
+      new Version("4.33.0"),
+      new Version(
+        "4.34.0",
+        new Migration() {
+          override def migrate(moduleId: String, version: String, context: java.util.Map[String, AnyRef]): Unit = {
+            implicit val formats: Formats = Serialization.formats(NoTypeHints)
+            import JDBCUtil._
+
+            val conn = context.get(Solidbase.CONNECTION).asInstanceOf[Connection]
+            val list = conn.select("SELECT * FROM ACTIVITY ORDER BY ACTIVITY_ID") {
+              rs =>
+                Activity(
+                  activityId = UUID.randomUUID().toString,
+                  userName = rs.getString("USER_NAME"),
+                  repositoryName = rs.getString("REPOSITORY_NAME"),
+                  activityUserName = rs.getString("ACTIVITY_USER_NAME"),
+                  activityType = rs.getString("ACTIVITY_TYPE"),
+                  message = rs.getString("MESSAGE"),
+                  additionalInfo = {
+                    val additionalInfo = rs.getString("ADDITIONAL_INFO")
+                    if (rs.wasNull()) None else Some(additionalInfo)
+                  },
+                  activityDate = rs.getTimestamp("ACTIVITY_DATE")
+                )
+            }
+            Using.resource(new FileOutputStream(ActivityLog, true)) { out =>
+              list.foreach { activity =>
+                out.write((write(activity) + "\n").getBytes(StandardCharsets.UTF_8))
+              }
+            }
+          }
+        },
+        new LiquibaseMigration("update/gitbucket-core_4.34.xml")
+      ),
+      new Version("4.35.0", new LiquibaseMigration("update/gitbucket-core_4.35.xml")),
+      new Version("4.35.1"),
+      new Version("4.35.2"),
+      new Version("4.35.3"),
+      new Version("4.36.0", new LiquibaseMigration("update/gitbucket-core_4.36.xml")),
+      new Version("4.36.1"),
+      new Version("4.36.2")
+    )

src/main/scala/gitbucket/core/api/AddACollaborator.scala

@@ -0,0 +1,9 @@
+package gitbucket.core.api
+
+case class AddACollaborator(permission: String) {
+  val role: String = permission match {
+    case "admin" => "ADMIN"
+    case "push"  => "DEVELOPER"
+    case "pull"  => "GUEST"
+  }
+}

src/main/scala/gitbucket/core/api/ApiBranch.scala

@@ -6,13 +6,14 @@ import gitbucket.core.util.RepositoryName
  * https://developer.github.com/v3/repos/#get-branch
  * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
  */
-case class ApiBranch(
-  name: String,
-  // commit: ApiBranchCommit,
-  protection: ApiBranchProtection)(repositoryName:RepositoryName) extends FieldSerializable {
-  def _links = Map(
-   "self" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/branches/${name}"),
-   "html" -> ApiPath(s"/${repositoryName.fullName}/tree/${name}"))
+case class ApiBranch(name: String, commit: ApiBranchCommit, protection: ApiBranchProtection)(
+  repositoryName: RepositoryName
+) extends FieldSerializable {
+  val _links =
+    Map(
+      "self" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/branches/${name}"),
+      "html" -> ApiPath(s"/${repositoryName.fullName}/tree/${name}")
+    )
 }
 
 case class ApiBranchCommit(sha: String)
@@ -21,3 +22,12 @@ case class ApiBranchForList(
   name: String,
   commit: ApiBranchCommit
 )
+
+/**
+ * https://docs.github.com/en/rest/reference/repos#list-branches-for-head-commit
+ */
+case class ApiBranchForHeadCommit(
+  name: String,
+  commit: ApiBranchCommit,
+  `protected`: Boolean
+)

src/main/scala/gitbucket/core/api/ApiBranchProtection.scala

@@ -4,43 +4,78 @@ import gitbucket.core.service.ProtectedBranchService
 import org.json4s._
 
 /** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
-case class ApiBranchProtection(enabled: Boolean, required_status_checks: Option[ApiBranchProtection.Status]){
+case class ApiBranchProtection(
+  url: Option[ApiPath], // for output
+  enabled: Boolean,
+  required_status_checks: Option[ApiBranchProtection.Status]
+) {
   def status: ApiBranchProtection.Status = required_status_checks.getOrElse(ApiBranchProtection.statusNone)
 }
 
-object ApiBranchProtection{
+object ApiBranchProtection {
+
   /** form for enabling-and-disabling-branch-protection */
   case class EnablingAndDisabling(protection: ApiBranchProtection)
 
-  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection = ApiBranchProtection(
-    enabled = info.enabled,
-    required_status_checks = Some(Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)))
-  val statusNone = Status(Off, Seq.empty)
-  case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
+  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection =
+    ApiBranchProtection(
+      url = Some(
+        ApiPath(
+          s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection"
+        )
+      ),
+      enabled = info.enabled,
+      required_status_checks = Some(
+        Status(
+          Some(
+            ApiPath(
+              s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection/required_status_checks"
+            )
+          ),
+          EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators),
+          info.contexts,
+          Some(
+            ApiPath(
+              s"/api/v3/repos/${info.owner}/${info.repository}/branches/${info.branch}/protection/required_status_checks/contexts"
+            )
+          )
+        )
+      )
+    )
+  val statusNone = Status(None, Off, Seq.empty, None)
+  case class Status(
+    url: Option[ApiPath], // for output
+    enforcement_level: EnforcementLevel,
+    contexts: Seq[String],
+    contexts_url: Option[ApiPath] // for output
+  )
   sealed class EnforcementLevel(val name: String)
   case object Off extends EnforcementLevel("off")
   case object NonAdmins extends EnforcementLevel("non_admins")
   case object Everyone extends EnforcementLevel("everyone")
   object EnforcementLevel {
-    def apply(enabled: Boolean, includeAdministrators: Boolean): EnforcementLevel = if(enabled){
-      if(includeAdministrators){
-        Everyone
-      }else{
-        NonAdmins
+    def apply(enabled: Boolean, includeAdministrators: Boolean): EnforcementLevel =
+      if (enabled) {
+        if (includeAdministrators) {
+          Everyone
+        } else {
+          NonAdmins
+        }
+      } else {
+        Off
       }
-    }else{
-      Off
-    }
   }
 
-  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](format => (
-   {
-     case JString("off") => Off
-     case JString("non_admins") => NonAdmins
-     case JString("everyone") => Everyone
-   },
-   {
-     case x: EnforcementLevel => JString(x.name)
-   }
- ))
+  implicit val enforcementLevelSerializer: CustomSerializer[EnforcementLevel] = new CustomSerializer[EnforcementLevel](
+    format =>
+      (
+        {
+          case JString("off")        => Off
+          case JString("non_admins") => NonAdmins
+          case JString("everyone")   => Everyone
+        }, {
+          case x: EnforcementLevel => JString(x.name)
+        }
+    )
+  )
 }

src/main/scala/gitbucket/core/api/ApiCombinedCommitStatus.scala

@@ -2,7 +2,6 @@ package gitbucket.core.api
 
 import gitbucket.core.model.{Account, CommitState, CommitStatus}
 
-
 /**
  * https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
  */
@@ -11,15 +10,22 @@ case class ApiCombinedCommitStatus(
   sha: String,
   total_count: Int,
   statuses: Iterable[ApiCommitStatus],
-  repository: ApiRepository){
+  repository: ApiRepository
+) {
   // val commit_url = ApiPath(s"/api/v3/repos/${repository.full_name}/${sha}")
   val url = ApiPath(s"/api/v3/repos/${repository.full_name}/commits/${sha}/status")
 }
 object ApiCombinedCommitStatus {
-  def apply(sha:String, statuses: Iterable[(CommitStatus, Account)], repository:ApiRepository): ApiCombinedCommitStatus = ApiCombinedCommitStatus(
-    state      = CommitState.combine(statuses.map(_._1.state).toSet).name,
-    sha        = sha,
-    total_count= statuses.size,
-    statuses   = statuses.map{ case (s, a)=> ApiCommitStatus(s, ApiUser(a)) },
-    repository = repository)
+  def apply(
+    sha: String,
+    statuses: Iterable[(CommitStatus, Account)],
+    repository: ApiRepository
+  ): ApiCombinedCommitStatus =
+    ApiCombinedCommitStatus(
+      state = CommitState.combine(statuses.map(_._1.state).toSet).name,
+      sha = sha,
+      total_count = statuses.size,
+      statuses = statuses.map { case (s, a) => ApiCommitStatus(s, ApiUser(a)) },
+      repository = repository
+    )
 }

src/main/scala/gitbucket/core/api/ApiComment.scala

@@ -5,25 +5,32 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/issues/comments/
  */
-case class ApiComment(
-  id: Int,
-  user: ApiUser,
-  body: String,
-  created_at: Date,
-  updated_at: Date)(repositoryName: RepositoryName, issueId: Int, isPullRequest: Boolean){
-  val html_url = ApiPath(s"/${repositoryName.fullName}/${if(isPullRequest){ "pull" }else{ "issues" }}/${issueId}#comment-${id}")
+case class ApiComment(id: Int, user: ApiUser, body: String, created_at: Date, updated_at: Date)(
+  repositoryName: RepositoryName,
+  issueId: Int,
+  isPullRequest: Boolean
+) {
+  val html_url = ApiPath(
+    s"/${repositoryName.fullName}/${if (isPullRequest) { "pull" } else { "issues" }}/${issueId}#comment-${id}"
+  )
 }
 
-object ApiComment{
-  def apply(comment: IssueComment, repositoryName: RepositoryName, issueId: Int, user: ApiUser, isPullRequest: Boolean): ApiComment =
+object ApiComment {
+  def apply(
+    comment: IssueComment,
+    repositoryName: RepositoryName,
+    issueId: Int,
+    user: ApiUser,
+    isPullRequest: Boolean
+  ): ApiComment =
     ApiComment(
       id = comment.commentId,
       user = user,
       body = comment.content,
       created_at = comment.registeredDate,
-      updated_at = comment.updatedDate)(repositoryName, issueId, isPullRequest)
+      updated_at = comment.updatedDate
+    )(repositoryName, issueId, isPullRequest)
 }

src/main/scala/gitbucket/core/api/ApiCommit.scala

@@ -20,38 +20,31 @@ case class ApiCommit(
   removed: List[String],
   modified: List[String],
   author: ApiPersonIdent,
-  committer: ApiPersonIdent)(repositoryName:RepositoryName, urlIsHtmlUrl: Boolean) extends FieldSerializable{
-  val url = if(urlIsHtmlUrl){
-    ApiPath(s"/${repositoryName.fullName}/commit/${id}")
-  }else{
-    ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
-  }
-  val html_url = if(urlIsHtmlUrl){
-    None
-  }else{
-    Some(ApiPath(s"/${repositoryName.fullName}/commit/${id}"))
-  }
+  committer: ApiPersonIdent
+)(repositoryName: RepositoryName)
+    extends FieldSerializable {
+  val url = ApiPath(s"/api/v3/${repositoryName.fullName}/commits/${id}")
+  val html_url = ApiPath(s"/${repositoryName.fullName}/commit/${id}")
 }
 
-object ApiCommit{
-  def apply(git: Git, repositoryName: RepositoryName, commit: CommitInfo, urlIsHtmlUrl: Boolean = false): ApiCommit = {
-    val diffs = JGitUtil.getDiffs(git, commit.id, false)
+object ApiCommit {
+  def apply(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit = {
+    val diffs = JGitUtil.getDiffs(git, None, commit.id, false, false)
     ApiCommit(
-      id        = commit.id,
-      message   = commit.fullMessage,
+      id = commit.id,
+      message = commit.fullMessage,
       timestamp = commit.commitTime,
-      added     = diffs._1.collect {
-        case x if x.changeType == DiffEntry.ChangeType.ADD    => x.newPath
+      added = diffs.collect {
+        case x if x.changeType == DiffEntry.ChangeType.ADD => x.newPath
       },
-      removed   = diffs._1.collect {
+      removed = diffs.collect {
         case x if x.changeType == DiffEntry.ChangeType.DELETE => x.oldPath
       },
-      modified  = diffs._1.collect {
+      modified = diffs.collect {
         case x if x.changeType != DiffEntry.ChangeType.ADD && x.changeType != DiffEntry.ChangeType.DELETE => x.newPath
       },
-      author    = ApiPersonIdent.author(commit),
+      author = ApiPersonIdent.author(commit),
       committer = ApiPersonIdent.committer(commit)
-    )(repositoryName, urlIsHtmlUrl)
+    )(repositoryName)
   }
-  def forPushPayload(git: Git, repositoryName: RepositoryName, commit: CommitInfo): ApiCommit = apply(git, repositoryName, commit, true)
 }

src/main/scala/gitbucket/core/api/ApiCommitListItem.scala

@@ -4,7 +4,6 @@ import gitbucket.core.api.ApiCommitListItem._
 import gitbucket.core.util.JGitUtil.CommitInfo
 import gitbucket.core.util.RepositoryName
 
-
 /**
  * https://developer.github.com/v3/repos/commits/
  */
@@ -13,30 +12,33 @@ case class ApiCommitListItem(
   commit: Commit,
   author: Option[ApiUser],
   committer: Option[ApiUser],
-  parents: Seq[Parent])(repositoryName: RepositoryName) {
+  parents: Seq[Parent]
+)(repositoryName: RepositoryName) {
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}")
 }
 
 object ApiCommitListItem {
-  def apply(commit: CommitInfo, repositoryName: RepositoryName): ApiCommitListItem = ApiCommitListItem(
-    sha    = commit.id,
-    commit = Commit(
-      message   = commit.fullMessage,
-      author    = ApiPersonIdent.author(commit),
-      committer = ApiPersonIdent.committer(commit)
+  def apply(commit: CommitInfo, repositoryName: RepositoryName): ApiCommitListItem =
+    ApiCommitListItem(
+      sha = commit.id,
+      commit = Commit(
+        message = commit.fullMessage,
+        author = ApiPersonIdent.author(commit),
+        committer = ApiPersonIdent.committer(commit)
       )(commit.id, repositoryName),
-    author    = None,
-    committer = None,
-    parents   = commit.parents.map(Parent(_)(repositoryName)))(repositoryName)
+      author = None,
+      committer = None,
+      parents = commit.parents.map(Parent(_)(repositoryName))
+    )(repositoryName)
 
-  case class Parent(sha: String)(repositoryName: RepositoryName){
+  case class Parent(sha: String)(repositoryName: RepositoryName) {
     val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}")
   }
 
-  case class Commit(
-    message: String,
-    author: ApiPersonIdent,
-    committer: ApiPersonIdent)(sha:String, repositoryName: RepositoryName) {
+  case class Commit(message: String, author: ApiPersonIdent, committer: ApiPersonIdent)(
+    sha: String,
+    repositoryName: RepositoryName
+  ) {
     val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/commits/${sha}")
   }
 }

src/main/scala/gitbucket/core/api/ApiCommitStatus.scala

@@ -5,7 +5,6 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/repos/statuses/#create-a-status
  * https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
@@ -23,16 +22,16 @@ case class ApiCommitStatus(
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${sha}/statuses")
 }
 
-
 object ApiCommitStatus {
-  def apply(status: CommitStatus, creator:ApiUser): ApiCommitStatus = ApiCommitStatus(
-    created_at = status.registeredDate,
-    updated_at = status.updatedDate,
-    state      = status.state.name,
-    target_url = status.targetUrl,
-    description= status.description,
-    id         = status.commitStatusId,
-    context    = status.context,
-    creator    = creator
-  )(status.commitId, RepositoryName(status))
+  def apply(status: CommitStatus, creator: ApiUser): ApiCommitStatus =
+    ApiCommitStatus(
+      created_at = status.registeredDate,
+      updated_at = status.updatedDate,
+      state = status.state.name,
+      target_url = status.targetUrl,
+      description = status.description,
+      id = status.commitStatusId,
+      context = status.context,
+      creator = creator
+    )(status.commitId, RepositoryName(status))
 }

src/main/scala/gitbucket/core/api/ApiCommits.scala

@@ -0,0 +1,129 @@
+package gitbucket.core.api
+
+import gitbucket.core.model.Account
+import gitbucket.core.util.JGitUtil.{CommitInfo, DiffInfo}
+import gitbucket.core.util.RepositoryName
+import org.eclipse.jgit.diff.DiffEntry.ChangeType
+import ApiCommits._
+
+case class ApiCommits(
+  url: ApiPath,
+  sha: String,
+  html_url: ApiPath,
+  comment_url: ApiPath,
+  commit: Commit,
+  author: ApiUser,
+  committer: ApiUser,
+  parents: Seq[Tree],
+  stats: Stats,
+  files: Seq[File]
+)
+
+object ApiCommits {
+  case class Commit(
+    url: ApiPath,
+    author: ApiPersonIdent,
+    committer: ApiPersonIdent,
+    message: String,
+    comment_count: Int,
+    tree: Tree
+  )
+
+  case class Tree(
+    url: ApiPath,
+    sha: String
+  )
+
+  case class Stats(
+    additions: Int,
+    deletions: Int,
+    total: Int
+  )
+
+  case class File(
+    filename: String,
+    additions: Int,
+    deletions: Int,
+    changes: Int,
+    status: String,
+    raw_url: ApiPath,
+    blob_url: ApiPath,
+    patch: String
+  )
+
+  def apply(
+    repositoryName: RepositoryName,
+    commitInfo: CommitInfo,
+    diffs: Seq[DiffInfo],
+    author: Account,
+    committer: Account,
+    commentCount: Int
+  ): ApiCommits = {
+    val files = diffs.map { diff =>
+      var additions = 0
+      var deletions = 0
+
+      diff.patch.getOrElse("").split("\n").foreach { line =>
+        if (line.startsWith("+")) additions = additions + 1
+        if (line.startsWith("-")) deletions = deletions + 1
+      }
+
+      File(
+        filename = if (diff.changeType == ChangeType.DELETE) { diff.oldPath } else { diff.newPath },
+        additions = additions,
+        deletions = deletions,
+        changes = additions + deletions,
+        status = diff.changeType match {
+          case ChangeType.ADD    => "added"
+          case ChangeType.MODIFY => "modified"
+          case ChangeType.DELETE => "deleted"
+          case ChangeType.RENAME => "renamed"
+          case ChangeType.COPY   => "copied"
+        },
+        raw_url = if (diff.changeType == ChangeType.DELETE) {
+          ApiPath(s"/${repositoryName.fullName}/raw/${commitInfo.parents.head}/${diff.oldPath}")
+        } else {
+          ApiPath(s"/${repositoryName.fullName}/raw/${commitInfo.id}/${diff.newPath}")
+        },
+        blob_url = if (diff.changeType == ChangeType.DELETE) {
+          ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.parents.head}/${diff.oldPath}")
+        } else {
+          ApiPath(s"/${repositoryName.fullName}/blob/${commitInfo.id}/${diff.newPath}")
+        },
+        patch = diff.patch.getOrElse("")
+      )
+    }
+
+    ApiCommits(
+      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
+      sha = commitInfo.id,
+      html_url = ApiPath(s"${repositoryName.fullName}/commit/${commitInfo.id}"),
+      comment_url = ApiPath(""), // TODO no API for commit comment
+      commit = Commit(
+        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/commits/${commitInfo.id}"),
+        author = ApiPersonIdent.author(commitInfo),
+        committer = ApiPersonIdent.committer(commitInfo),
+        message = commitInfo.shortMessage,
+        comment_count = commentCount,
+        tree = Tree(
+          url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/tree/${commitInfo.id}"), // TODO This endpoint has not been implemented yet.
+          sha = commitInfo.id
+        )
+      ),
+      author = ApiUser(author),
+      committer = ApiUser(committer),
+      parents = commitInfo.parents.map { parent =>
+        Tree(
+          url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/tree/${parent}"), // TODO This endpoint has not been implemented yet.
+          sha = parent
+        )
+      },
+      stats = Stats(
+        additions = files.map(_.additions).sum,
+        deletions = files.map(_.deletions).sum,
+        total = files.map(_.additions).sum + files.map(_.deletions).sum
+      ),
+      files = files
+    )
+  }
+}

src/main/scala/gitbucket/core/api/ApiContents.scala

@@ -1,11 +1,39 @@
 package gitbucket.core.api
 
+import java.util.Base64
+
 import gitbucket.core.util.JGitUtil.FileInfo
+import gitbucket.core.util.RepositoryName
 
-case class ApiContents(`type`: String, name: String)
+case class ApiContents(
+  `type`: String,
+  name: String,
+  path: String,
+  sha: String,
+  content: Option[String],
+  encoding: Option[String]
+)(repositoryName: RepositoryName) {
+  val download_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/raw/${sha}/${path}")
+}
 
-object ApiContents{
-  def apply(fileInfo: FileInfo): ApiContents =
-    if(fileInfo.isDirectory) ApiContents("dir", fileInfo.name)
-    else ApiContents("file", fileInfo.name)
-}
+object ApiContents {
+  def apply(fileInfo: FileInfo, repositoryName: RepositoryName, content: Option[Array[Byte]]): ApiContents = {
+    if (fileInfo.isDirectory) {
+      ApiContents("dir", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName)
+    } else {
+      content
+        .map(
+          arr =>
+            ApiContents(
+              "file",
+              fileInfo.name,
+              fileInfo.path,
+              fileInfo.id.getName,
+              Some(Base64.getEncoder.encodeToString(arr)),
+              Some("base64")
+            )(repositoryName)
+        )
+        .getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName))
+    }
+  }
+}

src/main/scala/gitbucket/core/api/ApiEndPoint.scala

@@ -1,3 +1,3 @@
 package gitbucket.core.api
 
-case class ApiEndPoint(rate_limit_url: ApiPath = ApiPath("/api/v3/rate_limit"))
+case class ApiEndPoint(rate_limit_url: ApiPath = ApiPath("/api/v3/rate_limit"))

src/main/scala/gitbucket/core/api/ApiError.scala

@@ -1,5 +1,3 @@
 package gitbucket.core.api
 
-case class ApiError(
-  message: String,
-  documentation_url: Option[String] = None)
+case class ApiError(message: String, documentation_url: Option[String] = None)

src/main/scala/gitbucket/core/api/ApiGroup.scala

@@ -0,0 +1,20 @@
+package gitbucket.core.api
+
+import java.util.Date
+
+import gitbucket.core.model.Account
+
+case class ApiGroup(login: String, description: Option[String], created_at: Date) {
+  val id = 0 // dummy id
+  val url = ApiPath(s"/api/v3/orgs/${login}")
+  val html_url = ApiPath(s"/${login}")
+  val avatar_url = ApiPath(s"/${login}/_avatar")
+}
+
+object ApiGroup {
+  def apply(group: Account): ApiGroup = ApiGroup(
+    login = group.userName,
+    description = group.description,
+    created_at = group.registeredDate
+  )
+}

src/main/scala/gitbucket/core/api/ApiIssue.scala

@@ -5,7 +5,6 @@ import gitbucket.core.util.RepositoryName
 
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/issues/
  */
@@ -13,33 +12,51 @@ case class ApiIssue(
   number: Int,
   title: String,
   user: ApiUser,
-  // labels,
+  assignee: Option[ApiUser],
+  labels: List[ApiLabel],
   state: String,
   created_at: Date,
   updated_at: Date,
-  body: String)(repositoryName: RepositoryName, isPullRequest: Boolean){
+  body: String,
+  milestone: Option[ApiMilestone]
+)(repositoryName: RepositoryName, isPullRequest: Boolean) {
+  val id = 0 // dummy id
+  val assignees = List(assignee).flatten
   val comments_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/issues/${number}/comments")
-  val html_url = ApiPath(s"/${repositoryName.fullName}/${if(isPullRequest){ "pull" }else{ "issues" }}/${number}")
+  val html_url = ApiPath(s"/${repositoryName.fullName}/${if (isPullRequest) { "pull" } else { "issues" }}/${number}")
   val pull_request = if (isPullRequest) {
-    Some(Map(
-      "url" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/${number}"),
-      "html_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}")
-      // "diff_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.diff"),
-      // "patch_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.patch")
-    ))
+    Some(
+      Map(
+        "url" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/${number}"),
+        "html_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}")
+        // "diff_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.diff"),
+        // "patch_url" -> ApiPath(s"/${repositoryName.fullName}/pull/${number}.patch")
+      )
+    )
   } else {
     None
   }
 }
 
-object ApiIssue{
-  def apply(issue: Issue, repositoryName: RepositoryName, user: ApiUser): ApiIssue =
+object ApiIssue {
+  def apply(
+    issue: Issue,
+    repositoryName: RepositoryName,
+    user: ApiUser,
+    assignee: Option[ApiUser],
+    labels: List[ApiLabel],
+    milestone: Option[ApiMilestone]
+  ): ApiIssue =
     ApiIssue(
       number = issue.issueId,
-      title  = issue.title,
-      user   = user,
-      state  = if(issue.closed){ "closed" }else{ "open" },
-      body   = issue.content.getOrElse(""),
+      title = issue.title,
+      user = user,
+      assignee = assignee,
+      labels = labels,
+      milestone = milestone,
+      state = if (issue.closed) { "closed" } else { "open" },
+      body = issue.content.getOrElse(""),
       created_at = issue.registeredDate,
-      updated_at = issue.updatedDate)(repositoryName, issue.isPullRequest)
+      updated_at = issue.updatedDate
+    )(repositoryName, issue.isPullRequest)
 }

src/main/scala/gitbucket/core/api/ApiLabel.scala

@@ -4,18 +4,16 @@ import gitbucket.core.model.Label
 import gitbucket.core.util.RepositoryName
 
 /**
-  * https://developer.github.com/v3/issues/labels/
-  */
-case class ApiLabel(
-  name: String,
-  color: String)(repositoryName: RepositoryName){
+ * https://developer.github.com/v3/issues/labels/
+ */
+case class ApiLabel(name: String, color: String)(repositoryName: RepositoryName) {
   var url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/labels/${name}")
 }
 
-object ApiLabel{
-  def apply(label:Label, repositoryName: RepositoryName): ApiLabel =
+object ApiLabel {
+  def apply(label: Label, repositoryName: RepositoryName): ApiLabel =
     ApiLabel(
       name = label.labelName,
       color = label.color
     )(repositoryName)
-}
+}

src/main/scala/gitbucket/core/api/ApiMilestone.scala

@@ -0,0 +1,49 @@
+package gitbucket.core.api
+
+import gitbucket.core.model.{Milestone, Repository}
+import gitbucket.core.util.RepositoryName
+import java.util.Date
+
+/**
+ * https://docs.github.com/en/rest/reference/issues#milestones
+ */
+case class ApiMilestone(
+  url: ApiPath,
+  html_url: ApiPath,
+//  label_url: ApiPath,
+  id: Int,
+  number: Int,
+  state: String,
+  title: String,
+  description: String,
+//  creator: ApiUser,  // MILESTONE table does not have created user column
+  open_issues: Int,
+  closed_issues: Int,
+//  created_at: Option[Date],
+//  updated_at: Option[Date],
+  closed_at: Option[Date],
+  due_on: Option[Date]
+)
+
+object ApiMilestone {
+  def apply(
+    repository: Repository,
+    milestone: Milestone,
+    open_issue_count: Int = 0,
+    closed_issue_count: Int = 0
+  ): ApiMilestone =
+    ApiMilestone(
+      url = ApiPath(s"/api/v3/repos/${RepositoryName(repository).fullName}/milestones/${milestone.milestoneId}"),
+      html_url = ApiPath(s"/${RepositoryName(repository).fullName}/milestone/${milestone.milestoneId}"),
+//      label_url = ApiPath(s"/api/v3/repos/${RepositoryName(repository).fullName}/milestones/${milestone_number}/labels"),
+      id = milestone.milestoneId,
+      number = milestone.milestoneId, // use milestoneId as number
+      state = if (milestone.closedDate.isDefined) "closed" else "open",
+      title = milestone.title,
+      description = milestone.description.getOrElse(""),
+      open_issues = open_issue_count,
+      closed_issues = closed_issue_count,
+      closed_at = milestone.closedDate,
+      due_on = milestone.dueDate
+    )
+}

src/main/scala/gitbucket/core/api/ApiPath.scala

@@ -1,6 +1,13 @@
 package gitbucket.core.api
 
 /**
- * path for api url. if set path '/repos/aa/bb' then, expand 'http://server:post/repos/aa/bb' when converted to json.
+ * Path for API url.
+ * If set path '/repos/aa/bb' then, expand 'http://server:port/repos/aa/bb' when converted to json.
  */
 case class ApiPath(path: String)
+
+/**
+ * Path for git repository via SSH.
+ * If set path '/aa/bb.git' then, expand 'git@server:port/aa/bb.git' when converted to json.
+ */
+case class SshPath(path: String)

src/main/scala/gitbucket/core/api/ApiPersonIdent.scala

@@ -4,22 +4,11 @@ import gitbucket.core.util.JGitUtil.CommitInfo
 
 import java.util.Date
 
-
-case class ApiPersonIdent(
-  name: String,
-  email: String,
-  date: Date)
-
+case class ApiPersonIdent(name: String, email: String, date: Date)
 
 object ApiPersonIdent {
   def author(commit: CommitInfo): ApiPersonIdent =
-    ApiPersonIdent(
-      name  = commit.authorName,
-      email = commit.authorEmailAddress,
-      date  = commit.authorTime)
+    ApiPersonIdent(name = commit.authorName, email = commit.authorEmailAddress, date = commit.authorTime)
   def committer(commit: CommitInfo): ApiPersonIdent =
-    ApiPersonIdent(
-      name  = commit.committerName,
-      email = commit.committerEmailAddress,
-      date  = commit.commitTime)
+    ApiPersonIdent(name = commit.committerName, email = commit.committerEmailAddress, date = commit.commitTime)
 }

src/main/scala/gitbucket/core/api/ApiPlugin.scala

@@ -0,0 +1,17 @@
+package gitbucket.core.api
+
+import gitbucket.core.plugin.PluginInfo
+
+case class ApiPlugin(
+  id: String,
+  name: String,
+  version: String,
+  description: String,
+  jarFileName: String
+)
+
+object ApiPlugin {
+  def apply(plugin: PluginInfo): ApiPlugin = {
+    ApiPlugin(plugin.pluginId, plugin.pluginName, plugin.pluginVersion, plugin.description, plugin.pluginJar.getName)
+  }
+}

src/main/scala/gitbucket/core/api/ApiPullRequest.scala

@@ -1,60 +1,75 @@
 package gitbucket.core.api
 
-import gitbucket.core.model.{Issue, PullRequest}
-
+import gitbucket.core.model.{Account, Issue, IssueComment, PullRequest}
 import java.util.Date
 
-
 /**
  * https://developer.github.com/v3/pulls/
  */
 case class ApiPullRequest(
   number: Int,
+  state: String,
   updated_at: Date,
   created_at: Date,
   head: ApiPullRequest.Commit,
   base: ApiPullRequest.Commit,
   mergeable: Option[Boolean],
+  merged: Boolean,
+  merged_at: Option[Date],
+  merged_by: Option[ApiUser],
   title: String,
   body: String,
-  user: ApiUser) {
-  val html_url            = ApiPath(s"${base.repo.html_url.path}/pull/${number}")
+  user: ApiUser,
+  labels: List[ApiLabel],
+  assignee: Option[ApiUser],
+  draft: Option[Boolean]
+) {
+  val id = 0 // dummy id
+  val html_url = ApiPath(s"${base.repo.html_url.path}/pull/${number}")
   //val diff_url            = ApiPath(s"${base.repo.html_url.path}/pull/${number}.diff")
   //val patch_url           = ApiPath(s"${base.repo.html_url.path}/pull/${number}.patch")
-  val url                 = ApiPath(s"${base.repo.url.path}/pulls/${number}")
+  val url = ApiPath(s"${base.repo.url.path}/pulls/${number}")
   //val issue_url           = ApiPath(s"${base.repo.url.path}/issues/${number}")
-  val commits_url         = ApiPath(s"${base.repo.url.path}/pulls/${number}/commits")
+  val commits_url = ApiPath(s"${base.repo.url.path}/pulls/${number}/commits")
   val review_comments_url = ApiPath(s"${base.repo.url.path}/pulls/${number}/comments")
-  val review_comment_url  = ApiPath(s"${base.repo.url.path}/pulls/comments/{number}")
-  val comments_url        = ApiPath(s"${base.repo.url.path}/issues/${number}/comments")
-  val statuses_url        = ApiPath(s"${base.repo.url.path}/statuses/${head.sha}")
+  val review_comment_url = ApiPath(s"${base.repo.url.path}/pulls/comments/{number}")
+  val comments_url = ApiPath(s"${base.repo.url.path}/issues/${number}/comments")
+  val statuses_url = ApiPath(s"${base.repo.url.path}/statuses/${head.sha}")
 }
 
-object ApiPullRequest{
-  def apply(issue: Issue, pullRequest: PullRequest, headRepo: ApiRepository, baseRepo: ApiRepository, user: ApiUser): ApiPullRequest =
+object ApiPullRequest {
+  def apply(
+    issue: Issue,
+    pullRequest: PullRequest,
+    headRepo: ApiRepository,
+    baseRepo: ApiRepository,
+    user: ApiUser,
+    labels: List[ApiLabel],
+    assignee: Option[ApiUser],
+    mergedComment: Option[(IssueComment, Account)]
+  ): ApiPullRequest =
     ApiPullRequest(
-      number     = issue.issueId,
+      number = issue.issueId,
+      state = if (issue.closed) "closed" else "open",
       updated_at = issue.updatedDate,
       created_at = issue.registeredDate,
-      head       = Commit(
-                     sha  = pullRequest.commitIdTo,
-                     ref  = pullRequest.requestBranch,
-                     repo = headRepo)(issue.userName),
-      base       = Commit(
-                     sha  = pullRequest.commitIdFrom,
-                     ref  = pullRequest.branch,
-                     repo = baseRepo)(issue.userName),
-      mergeable  = None, // TODO: need check mergeable.
-      title      = issue.title,
-      body       = issue.content.getOrElse(""),
-      user       = user
+      head = Commit(sha = pullRequest.commitIdTo, ref = pullRequest.requestBranch, repo = headRepo)(issue.userName),
+      base = Commit(sha = pullRequest.commitIdFrom, ref = pullRequest.branch, repo = baseRepo)(issue.userName),
+      mergeable = None, // TODO: need check mergeable.
+      merged = mergedComment.isDefined,
+      merged_at = mergedComment.map { case (comment, _) => comment.registeredDate },
+      merged_by = mergedComment.map { case (_, account) => ApiUser(account) },
+      title = issue.title,
+      body = issue.content.getOrElse(""),
+      user = user,
+      labels = labels,
+      assignee = assignee,
+      draft = Some(pullRequest.isDraft)
     )
 
-  case class Commit(
-    sha: String,
-    ref: String,
-    repo: ApiRepository)(baseOwner:String){
-    val label = if( baseOwner == repo.owner.login ){ ref }else{ s"${repo.owner.login}:${ref}" }
+  case class Commit(sha: String, ref: String, repo: ApiRepository)(baseOwner: String) {
+    val label = if (baseOwner == repo.owner.login) { ref } else { s"${repo.owner.login}:${ref}" }
     val user = repo.owner
   }
+
 }

src/main/scala/gitbucket/core/api/ApiPullRequestReviewComment.scala

@@ -17,10 +17,11 @@ case class ApiPullRequestReviewComment(
   commit_id: String, // "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   // "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
   user: ApiUser,
-  body: String, // "Maybe you should use more emojji on this line.",
-  created_at: Date,  // "2015-05-05T23:40:27Z",
+  body: String, // "Maybe you should use more emoji on this line.",
+  created_at: Date, // "2015-05-05T23:40:27Z",
   updated_at: Date // "2015-05-05T23:40:27Z",
-)(repositoryName:RepositoryName, issueId: Int) extends FieldSerializable {
+)(repositoryName: RepositoryName, issueId: Int)
+    extends FieldSerializable {
   // "url": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/comments/29724692",
   val url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/pulls/comments/${id}")
   // "html_url": "https://github.com/baxterthehacker/public-repo/pull/1#discussion_r29724692",
@@ -40,22 +41,28 @@ case class ApiPullRequestReviewComment(
         "href": "https://api.github.com/repos/baxterthehacker/public-repo/pulls/1"
       }
     }
-  */
+   */
   val _links = Map(
     "self" -> Map("href" -> url),
     "html" -> Map("href" -> html_url),
-    "pull_request" -> Map("href" -> pull_request_url))
+    "pull_request" -> Map("href" -> pull_request_url)
+  )
 }
 
-object ApiPullRequestReviewComment{
-  def apply(comment: CommitComment, commentedUser: ApiUser, repositoryName: RepositoryName, issueId: Int): ApiPullRequestReviewComment =
+object ApiPullRequestReviewComment {
+  def apply(
+    comment: CommitComment,
+    commentedUser: ApiUser,
+    repositoryName: RepositoryName,
+    issueId: Int
+  ): ApiPullRequestReviewComment =
     new ApiPullRequestReviewComment(
-     id = comment.commentId,
-     path = comment.fileName.getOrElse(""),
-     commit_id = comment.commitId,
-     user = commentedUser,
-     body = comment.content,
-     created_at = comment.registeredDate,
-     updated_at = comment.updatedDate
-  )(repositoryName, issueId)
+      id = comment.commentId,
+      path = comment.fileName.getOrElse(""),
+      commit_id = comment.commitId,
+      user = commentedUser,
+      body = comment.content,
+      created_at = comment.registeredDate,
+      updated_at = comment.updatedDate
+    )(repositoryName, issueId)
 }

src/main/scala/gitbucket/core/api/ApiPusher.scala

@@ -5,7 +5,5 @@ import gitbucket.core.model.Account
 case class ApiPusher(name: String, email: String)
 
 object ApiPusher {
-  def apply(user: Account): ApiPusher = ApiPusher(
-    name  = user.userName,
-    email = user.mailAddress)
-}
+  def apply(user: Account): ApiPusher = ApiPusher(name = user.userName, email = user.mailAddress)
+}

src/main/scala/gitbucket/core/api/ApiRelease.scala

@@ -0,0 +1,42 @@
+package gitbucket.core.api
+import gitbucket.core.model.{Account, ReleaseAsset, ReleaseTag}
+import gitbucket.core.util.RepositoryName
+
+case class ApiReleaseAsset(name: String, size: Long)(tag: String, fileName: String, repositoryName: RepositoryName) {
+  val label = name
+  val file_id = fileName
+  val browser_download_url = ApiPath(
+    s"/${repositoryName.fullName}/releases/${tag}/assets/${fileName}"
+  )
+}
+
+object ApiReleaseAsset {
+  def apply(asset: ReleaseAsset, repositoryName: RepositoryName): ApiReleaseAsset =
+    ApiReleaseAsset(asset.label, asset.size)(asset.tag, asset.fileName, repositoryName)
+}
+
+case class ApiRelease(
+  name: String,
+  tag_name: String,
+  body: Option[String],
+  author: ApiUser,
+  assets: Seq[ApiReleaseAsset]
+)
+
+object ApiRelease {
+  def apply(
+    release: ReleaseTag,
+    assets: Seq[ReleaseAsset],
+    author: Account,
+    repositoryName: RepositoryName
+  ): ApiRelease =
+    ApiRelease(
+      release.name,
+      release.tag,
+      release.content,
+      ApiUser(author),
+      assets.map { asset =>
+        ApiReleaseAsset(asset, repositoryName)
+      }
+    )
+}

src/main/scala/gitbucket/core/api/ApiRepository.scala

@@ -3,7 +3,6 @@ package gitbucket.core.api
 import gitbucket.core.model.{Account, Repository}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 
-
 // https://developer.github.com/v3/repos/
 case class ApiRepository(
   name: String,
@@ -13,44 +12,57 @@ case class ApiRepository(
   forks: Int,
   `private`: Boolean,
   default_branch: String,
-  owner: ApiUser)(urlIsHtmlUrl: Boolean) {
+  owner: ApiUser,
+  has_issues: Boolean
+) {
+  val id = 0 // dummy id
   val forks_count = forks
   val watchers_count = watchers
-  val url = if(urlIsHtmlUrl){
-    ApiPath(s"/${full_name}")
-  } else {
-    ApiPath(s"/api/v3/repos/${full_name}")
-  }
-  val http_url  = ApiPath(s"/git/${full_name}.git")
+  val url = ApiPath(s"/api/v3/repos/${full_name}")
   val clone_url = ApiPath(s"/git/${full_name}.git")
-  val html_url  = ApiPath(s"/${full_name}")
+  val html_url = ApiPath(s"/${full_name}")
+  val ssh_url = Some(SshPath(s":${full_name}.git"))
 }
 
-object ApiRepository{
+object ApiRepository {
   def apply(
-      repository: Repository,
-      owner: ApiUser,
-      forkedCount: Int =0,
-      watchers: Int = 0,
-      urlIsHtmlUrl: Boolean = false): ApiRepository =
+    repository: Repository,
+    owner: ApiUser,
+    forkedCount: Int = 0,
+    watchers: Int = 0
+  ): ApiRepository =
     ApiRepository(
-      name           = repository.repositoryName,
-      full_name      = s"${repository.userName}/${repository.repositoryName}",
-      description    = repository.description.getOrElse(""),
-      watchers       = 0,
-      forks          = forkedCount,
-      `private`      = repository.isPrivate,
+      name = repository.repositoryName,
+      full_name = s"${repository.userName}/${repository.repositoryName}",
+      description = repository.description.getOrElse(""),
+      watchers = watchers,
+      forks = forkedCount,
+      `private` = repository.isPrivate,
       default_branch = repository.defaultBranch,
-      owner          = owner
-    )(urlIsHtmlUrl)
+      owner = owner,
+      has_issues = if (repository.options.issuesOption == "DISABLE") false else true
+    )
 
   def apply(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
-    ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount)
+    ApiRepository(
+      repositoryInfo.repository,
+      owner,
+      forkedCount = repositoryInfo.forkedCount
+    )
 
   def apply(repositoryInfo: RepositoryInfo, owner: Account): ApiRepository =
-    this(repositoryInfo.repository, ApiUser(owner))
-
-  def forPushPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
-    ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount, urlIsHtmlUrl=true)
+    this(repositoryInfo, ApiUser(owner))
 
+  def forDummyPayload(owner: ApiUser): ApiRepository =
+    ApiRepository(
+      name = "dummy",
+      full_name = s"${owner.login}/dummy",
+      description = "",
+      watchers = 0,
+      forks = 0,
+      `private` = false,
+      default_branch = "master",
+      owner = owner,
+      has_issues = true
+    )
 }

src/main/scala/gitbucket/core/api/ApiRepositoryCollaborator.scala

@@ -0,0 +1,6 @@
+package gitbucket.core.api
+
+case class ApiRepositoryCollaborator(
+  permission: String,
+  user: ApiUser
+)

src/main/scala/gitbucket/core/api/ApiTag.scala

@@ -0,0 +1,29 @@
+package gitbucket.core.api
+
+import gitbucket.core.util.RepositoryName
+
+case class ApiTagCommit(
+  sha: String,
+  url: ApiPath
+)
+
+case class ApiTag(
+  name: String,
+  commit: ApiTagCommit,
+  zipball_url: ApiPath,
+  tarball_url: ApiPath
+)
+
+object ApiTag {
+  def apply(
+    tagName: String,
+    repositoryName: RepositoryName,
+    commitId: String
+  ): ApiTag =
+    ApiTag(
+      name = tagName,
+      commit = ApiTagCommit(sha = commitId, url = ApiPath(s"/${repositoryName.fullName}/commits/${commitId}")),
+      zipball_url = ApiPath(s"/${repositoryName.fullName}/archive/${tagName}.zip"),
+      tarball_url = ApiPath(s"/${repositoryName.fullName}/archive/${tagName}.tar.gz")
+    )
+}

src/main/scala/gitbucket/core/api/ApiUser.scala

@@ -4,16 +4,11 @@ import gitbucket.core.model.Account
 
 import java.util.Date
 
-
-case class ApiUser(
-  login: String,
-  email: String,
-  `type`: String,
-  site_admin: Boolean,
-  created_at: Date) {
-  val url                 = ApiPath(s"/api/v3/users/${login}")
-  val html_url            = ApiPath(s"/${login}")
-  val avatar_url          = ApiPath(s"/${login}/_avatar")
+case class ApiUser(login: String, email: String, `type`: String, site_admin: Boolean, created_at: Date) {
+  val id = 0 // dummy id
+  val url = ApiPath(s"/api/v3/users/${login}")
+  val html_url = ApiPath(s"/${login}")
+  val avatar_url = ApiPath(s"/${login}/_avatar")
   // val followers_url       = ApiPath(s"/api/v3/users/${login}/followers")
   // val following_url       = ApiPath(s"/api/v3/users/${login}/following{/other_user}")
   // val gists_url           = ApiPath(s"/api/v3/users/${login}/gists{/gist_id}")
@@ -25,12 +20,11 @@ case class ApiUser(
   // val received_events_url = ApiPath(s"/api/v3/users/${login}/received_events")
 }
 
-
-object ApiUser{
+object ApiUser {
   def apply(user: Account): ApiUser = ApiUser(
-    login      = user.userName,
-    email      = user.mailAddress,
-    `type`     = if(user.isGroupAccount){ "Organization" }else{ "User" },
+    login = user.userName,
+    email = user.mailAddress,
+    `type` = if (user.isGroupAccount) { "Organization" } else { "User" },
     site_admin = user.isAdmin,
     created_at = user.registeredDate
   )

src/main/scala/gitbucket/core/api/ApiWebhook.scala

@@ -0,0 +1,44 @@
+package gitbucket.core.api
+
+import gitbucket.core.model.{RepositoryWebHook, WebHook}
+
+/**
+ * https://docs.github.com/en/rest/reference/repos#webhooks
+ */
+case class ApiWebhookConfig(
+  content_type: String,
+//  insecure_ssl: String,
+  url: String
+)
+
+case class ApiWebhook(
+  `type`: String,
+  id: Int,
+  name: String,
+  active: Boolean,
+  events: List[String],
+  config: ApiWebhookConfig,
+//  updated_at: Option[Date],
+//  created_at: Option[Date],
+  url: ApiPath,
+//  test_url: ApiPath,
+//  ping_url: ApiPath,
+//  last_response: ...
+)
+
+object ApiWebhook {
+  def apply(
+    _type: String,
+    hook: RepositoryWebHook,
+    hookEvents: Set[WebHook.Event]
+  ): ApiWebhook =
+    ApiWebhook(
+      `type` = _type,
+      id = hook.hookId,
+      name = "web", // dummy
+      active = true, // dummy
+      events = hookEvents.toList.map(_.name),
+      config = ApiWebhookConfig(hook.ctype.code, hook.url),
+      url = ApiPath(s"/api/v3/${hook.userName}/${hook.repositoryName}/hooks/${hook.hookId}")
+    )
+}

src/main/scala/gitbucket/core/api/CreateAFile.scala

@@ -0,0 +1,13 @@
+package gitbucket.core.api
+
+/**
+ * https://developer.github.com/v3/repos/contents/#create-a-file
+ */
+case class CreateAFile(
+  message: String,
+  content: String,
+  sha: Option[String],
+  branch: Option[String],
+  committer: Option[ApiPusher],
+  author: Option[ApiPusher]
+)

src/main/scala/gitbucket/core/api/CreateAGroup.scala

@@ -0,0 +1,8 @@
+package gitbucket.core.api
+
+case class CreateAGroup(
+  login: String,
+  admin: String,
+  profile_name: Option[String],
+  url: Option[String]
+)