Merge branch 'master' into fork-button

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' into fork-button master
commit 79a7df254e23491ac9c2b13887821f8a6d1b81a6 2 parents 6e4a203 + 163fcd8 Naoki Takezoe authored on 20 Jun 2018

Patch

Unified Split

Showing 77 changed files

Ignore Space Show notes View CHANGELOG.md

Ignore Space Show notes View README.md

Ignore Space Show notes View build.sbt

Ignore Space Show notes View doc/comment_action.md

Ignore Space Show notes View plugins.json

Ignore Space Show notes View project/build.properties

Ignore Space Show notes View src/main/resources/update/gitbucket-core_4.25.xml 0 → 100644

Ignore Space Show notes View src/main/scala/gitbucket/core/GitBucketCoreModule.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/AccountController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/ApiController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/ControllerBase.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/DashboardController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/IndexController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/IssuesController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/PullRequestsController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/ReleasesController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/SystemSettingsController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/plugin/IssueHook.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/AccessTokenService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/AccountService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/IssuesService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/RepositoryService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/SystemSettingsService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/FileUtil.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/JGitUtil.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/StringUtil.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/view/helpers.scala

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/activity.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/main.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/members.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/newrepo.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/account/repositories.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/admin/settings_system.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/admin/userlist.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/dashboard/issues.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/dashboard/pulls.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/dashboard/repos.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/dashboard/tab.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/helper/activities.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/helper/commitcomment.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/helper/commitcomments.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/helper/diff.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/helper/forkrepository.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/helper/preview.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/index.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/commentlist.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/editcomment.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/editissue.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/issues/issueinfo.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/main.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/commits.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/compare.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/conversation.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/files.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/menu.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/releases/list.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/releases/release.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/blob.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/commentform.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/commit.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/editcomment.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/editor.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/files.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/find.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/forked.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/search/repositories.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/settings/menu.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/wiki/history.scala.html

Ignore Space Show notes View src/main/webapp/WEB-INF/web.xml

Ignore Space Show notes View src/main/webapp/assets/common/css/gitbucket.css

Ignore Space Show notes View src/main/webapp/assets/common/js/gitbucket.js

Ignore Space Show notes View src/main/webapp/assets/vendors/facebox/facebox.css

Ignore Space Show notes View src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala

Show line notes below