diff --git a/.gitignore b/.gitignore
index 8f14100..d2d9e22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,8 @@
.classpath
.project
.cache
+.cache-main
+.cache-tests
.settings
# IntelliJ specific
diff --git a/.travis.yml b/.travis.yml
index 8eb0548..51df01e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,10 @@
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
+ - sudo chmod +x /usr/local/bin/sbt
cache:
directories:
- $HOME/.ivy2/cache
@@ -18,10 +16,20 @@
- $HOME/.embedpostgresql
matrix:
include:
+ - jdk: oraclejdk8
+ addons:
+ apt:
+ packages:
+ - libaio1
- dist: trusty
group: edge
sudo: required
jdk: oraclejdk9
+ addons:
+ apt:
+ packages:
+ - libaio1
+ - oracle-java9-installer
script:
# https://github.com/sbt/sbt/pull/2951
- git clone https://github.com/retronym/java9-rt-export
@@ -30,9 +38,9 @@
- jdk_switcher use oraclejdk8
- sbt package
- jdk_switcher use oraclejdk9
+ - java -version
- mkdir -p $HOME/.sbt/0.13/java9-rt-ext; java -jar target/java9-rt-export-*.jar $HOME/.sbt/0.13/java9-rt-ext/rt.jar
- jar tf $HOME/.sbt/0.13/java9-rt-ext/rt.jar | grep java/lang/Object
- cd ..
- - echo "sbt.version=0.13.14-RC1" > project/build.properties
- wget https://raw.githubusercontent.com/paulp/sbt-extras/9ade5fa54914ca8aded44105bf4b9a60966f3ccd/sbt && chmod +x ./sbt
- ./sbt -Dscala.ext.dirs=$HOME/.sbt/0.13/java9-rt-ext test
diff --git a/README.md b/README.md
index feadf3a..5bcc953 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,12 @@
- `--host=[HOSTNAME]`
- `--gitbucket.home=[DATA_DIR]`
- `--temp_dir=[TEMP_DIR]`
+- `--max_file_size=[MAX_FILE_SIZE]`
`TEMP_DIR` is used as the [temporary directory for the jetty application context](https://www.eclipse.org/jetty/documentation/9.3.x/ref-temporary-directories.html). This is the directory into which the `gitbucket.war` file is unpacked, the source files are compiled, etc. If given this parameter **must** match the path of an existing directory or the application will quit reporting an error; if not given the path used will be a `tmp` directory inside the gitbucket home.
+`MAX_FILE_SIZE` is the max file size for upload files.
+
You can also deploy `gitbucket.war` to a servlet container which supports Servlet 3.0 (like Jetty, Tomcat, JBoss, etc)
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).
@@ -68,6 +71,22 @@
Release Notes
-------------
+### 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
diff --git a/build.sbt b/build.sbt
index b0d7947..569e462 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,8 +1,8 @@
val Organization = "io.github.gitbucket"
val Name = "gitbucket"
-val GitBucketVersion = "4.11.0-SNAPSHOT"
+val GitBucketVersion = "4.14.1"
val ScalatraVersion = "2.5.0"
-val JettyVersion = "9.3.9.v20160517"
+val JettyVersion = "9.3.19.v20170502"
lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin)
@@ -25,38 +25,39 @@
"org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.7.0.201704051617-r",
"org.scalatra" %% "scalatra" % ScalatraVersion,
"org.scalatra" %% "scalatra-json" % ScalatraVersion,
- "org.json4s" %% "json4s-jackson" % "3.5.0",
+ "org.json4s" %% "json4s-jackson" % "3.5.1",
"io.github.gitbucket" %% "scalatra-forms" % "1.1.0",
- "commons-io" % "commons-io" % "2.4",
- "io.github.gitbucket" % "solidbase" % "1.0.0",
- "io.github.gitbucket" % "markedj" % "1.0.10",
- "org.apache.commons" % "commons-compress" % "1.11",
+ "commons-io" % "commons-io" % "2.5",
+ "io.github.gitbucket" % "solidbase" % "1.0.2",
+ "io.github.gitbucket" % "markedj" % "1.0.12",
+ "org.apache.commons" % "commons-compress" % "1.13",
"org.apache.commons" % "commons-email" % "1.4",
- "org.apache.httpcomponents" % "httpclient" % "4.5.1",
- "org.apache.sshd" % "apache-sshd" % "1.2.0",
- "org.apache.tika" % "tika-core" % "1.13",
+ "org.apache.httpcomponents" % "httpclient" % "4.5.3",
+ "org.apache.sshd" % "apache-sshd" % "1.4.0" exclude("org.slf4j","slf4j-jdk14"),
+ "org.apache.tika" % "tika-core" % "1.14",
"com.github.takezoe" %% "blocking-slick-32" % "0.0.8",
- "joda-time" % "joda-time" % "2.9.6",
+ "joda-time" % "joda-time" % "2.9.9",
"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.4.12",
+ "com.h2database" % "h2" % "1.4.195",
+ "org.mariadb.jdbc" % "mariadb-java-client" % "2.0.3",
+ "org.postgresql" % "postgresql" % "42.0.0",
+ "ch.qos.logback" % "logback-classic" % "1.2.3",
+ "com.zaxxer" % "HikariCP" % "2.6.1",
+ "com.typesafe" % "config" % "1.3.1",
+ "com.typesafe.akka" %% "akka-actor" % "2.5.0",
"fr.brouillard.oss.security.xhub" % "xhub4j-core" % "1.0.0",
"com.github.bkromhout" % "java-diff-utils" % "2.1.1",
"org.cache2k" % "cache2k-all" % "1.0.0.CR1",
"com.enragedginger" %% "akka-quartz-scheduler" % "1.6.0-akka-2.4.x" exclude("c3p0","c3p0"),
"net.coobird" % "thumbnailator" % "0.4.8",
+ "com.github.zafarkhaja" % "java-semver" % "0.9.0",
"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.mockito" % "mockito-core" % "2.7.16" % "test",
+ "org.mockito" % "mockito-core" % "2.7.22" % "test",
"com.wix" % "wix-embedded-mysql" % "2.1.4" % "test",
- "ru.yandex.qatools.embed" % "postgresql-embedded" % "1.14" % "test"
+ "ru.yandex.qatools.embed" % "postgresql-embedded" % "2.0" % "test"
)
// Compiler settings
diff --git a/doc/notification.md b/doc/notification.md
index f9fb1e0..db0e48d 100644
--- a/doc/notification.md
+++ b/doc/notification.md
@@ -17,6 +17,7 @@
Notified users are as follows:
* individual repository's owner
+* group members of group repository
* collaborators
* participants
diff --git a/project/build.properties b/project/build.properties
index 27e88aa..64317fd 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.15
diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java
index 01245c2..94525fd 100644
--- a/src/main/java/JettyLauncher.java
+++ b/src/main/java/JettyLauncher.java
@@ -39,6 +39,9 @@
contextPath = "/" + contextPath;
}
break;
+ case "--max_file_size":
+ System.setProperty("gitbucket.maxFileSize", dim[2]);
+ break;
case "--gitbucket.home":
System.setProperty("gitbucket.home", dim[1]);
break;
@@ -96,6 +99,9 @@
}
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();
@@ -128,17 +134,6 @@
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);
- }
- }
- dir.delete();
- }
-
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
diff --git a/src/main/resources/plugins/plugins b/src/main/resources/plugins/plugins
new file mode 100644
index 0000000..a550c0e
--- /dev/null
+++ b/src/main/resources/plugins/plugins
@@ -0,0 +1 @@
+#gitbucket-gist-plugin_2.12-4.9.0.jar
diff --git a/src/main/resources/update/gitbucket-core_4.14.sql b/src/main/resources/update/gitbucket-core_4.14.sql
new file mode 100644
index 0000000..1ba0103
--- /dev/null
+++ b/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);
diff --git a/src/main/resources/update/gitbucket-core_4.14.xml b/src/main/resources/update/gitbucket-core_4.14.xml
new file mode 100644
index 0000000..b73fa5b
--- /dev/null
+++ b/src/main/resources/update/gitbucket-core_4.14.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala
index c767f59..7bc40ca 100644
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -43,6 +43,7 @@
context.mount(new RepositoryViewerController, "/*")
context.mount(new WikiController, "/*")
context.mount(new LabelsController, "/*")
+ context.mount(new PrioritiesController, "/*")
context.mount(new MilestonesController, "/*")
context.mount(new IssuesController, "/*")
context.mount(new PullRequestsController, "/*")
diff --git a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
index b33a909..b5a2df8 100644
--- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
+++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
@@ -32,5 +32,12 @@
new Version("4.11.0",
new LiquibaseMigration("update/gitbucket-core_4.11.xml")
),
- new Version("4.12.0")
+ 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")
)
diff --git a/src/main/scala/gitbucket/core/api/ApiRepository.scala b/src/main/scala/gitbucket/core/api/ApiRepository.scala
index a6c5bd5..1f79072 100644
--- a/src/main/scala/gitbucket/core/api/ApiRepository.scala
+++ b/src/main/scala/gitbucket/core/api/ApiRepository.scala
@@ -53,4 +53,14 @@
def forPushPayload(repositoryInfo: RepositoryInfo, owner: ApiUser): ApiRepository =
ApiRepository(repositoryInfo.repository, owner, forkedCount=repositoryInfo.forkedCount, urlIsHtmlUrl=true)
+ 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)(true)
}
diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index 51dd1d1..77eaa1a 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -2,9 +2,10 @@
import gitbucket.core.account.html
import gitbucket.core.helper
-import gitbucket.core.model.{GroupMember, Role}
+import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, RepositoryWebHookEvent, Role, WebHook, WebHookContentType}
import gitbucket.core.plugin.PluginRegistry
import gitbucket.core.service._
+import gitbucket.core.service.WebHookService._
import gitbucket.core.ssh.SshUtil
import gitbucket.core.util.SyntaxSugars._
import gitbucket.core.util.Directory._
@@ -16,17 +17,16 @@
import org.scalatra.i18n.Messages
import org.scalatra.BadRequest
-
class AccountController extends AccountControllerBase
with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
- with AccessTokenService with WebHookService with RepositoryCreationService
+ with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService
trait AccountControllerBase extends AccountManagementControllerBase {
self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
- with AccessTokenService with WebHookService with RepositoryCreationService =>
+ with AccessTokenService with WebHookService with PrioritiesService with RepositoryCreationService =>
case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
description: Option[String], url: Option[String], fileId: Option[String])
@@ -40,7 +40,7 @@
val newForm = mapping(
"userName" -> trim(label("User name" , text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
- "password" -> trim(label("Password" , text(required, maxlength(20)))),
+ "password" -> trim(label("Password" , text(required, maxlength(20), password))),
"fullName" -> trim(label("Full Name" , text(required, maxlength(100)))),
"mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
"description" -> trim(label("bio" , optional(text()))),
@@ -49,7 +49,7 @@
)(AccountNewForm.apply)
val editForm = mapping(
- "password" -> trim(label("Password" , optional(text(maxlength(20))))),
+ "password" -> trim(label("Password" , optional(text(maxlength(20), password)))),
"fullName" -> trim(label("Full Name" , text(required, maxlength(100)))),
"mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
"description" -> trim(label("bio" , optional(text()))),
@@ -109,6 +109,47 @@
"account" -> trim(label("Group/User name", text(required, validAccountName)))
)(AccountForm.apply)
+ // for account web hook url addition.
+ case class AccountWebHookForm(url: String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])
+
+ def accountWebHookForm(update:Boolean) = mapping(
+ "url" -> trim(label("url", text(required, accountWebHook(update)))),
+ "events" -> accountWebhookEvents,
+ "ctype" -> label("ctype", text()),
+ "token" -> optional(trim(label("token", text(maxlength(100)))))
+ )(
+ (url, events, ctype, token) => AccountWebHookForm(url, events, WebHookContentType.valueOf(ctype), token)
+ )
+ /**
+ * Provides duplication check for web hook url. duplicated from RepositorySettingsController.scala
+ */
+ private def accountWebHook(needExists: Boolean): Constraint = new Constraint(){
+ override def validate(name: String, value: String, messages: Messages): Option[String] =
+ if(getAccountWebHook(params("userName"), value).isDefined != needExists){
+ Some(if(needExists){
+ "URL had not been registered yet."
+ } else {
+ "URL had been registered already."
+ })
+ } else {
+ None
+ }
+ }
+
+ private def accountWebhookEvents = new ValueType[Set[WebHook.Event]]{
+ def convert(name: String, params: Map[String, String], messages: Messages): Set[WebHook.Event] = {
+ WebHook.Event.values.flatMap { t =>
+ params.get(name + "." + t.name).map(_ => t)
+ }.toSet
+ }
+ def validate(name: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = if(convert(name,params,messages).isEmpty){
+ Seq(name -> messages("error.required").format(name))
+ } else {
+ Nil
+ }
+ }
+
+
/**
* Displays user information.
*/
@@ -206,9 +247,13 @@
// FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
// FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
// }
-// // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+ // Remove from GROUP_MEMBER and COLLABORATOR
removeUserRelatedData(userName)
updateAccount(account.copy(isRemoved = true))
+
+ // call hooks
+ PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
+
session.invalidate
redirect("/")
}
@@ -269,6 +314,113 @@
redirect(s"/${userName}/_application")
})
+ get("/:userName/_hooks")(oneselfOnly {
+ val userName = params("userName")
+ getAccountByUserName(userName).map { account =>
+ gitbucket.core.account.html.hooks(account, getAccountWebHooks(account.userName), flash.get("info"))
+ } getOrElse NotFound()
+ })
+
+ /**
+ * Display the account web hook edit page.
+ */
+ get("/:userName/_hooks/new")(oneselfOnly {
+ val userName = params("userName")
+ getAccountByUserName(userName).map { account =>
+ val webhook = AccountWebHook(userName, "", WebHookContentType.FORM, None)
+ html.edithook(webhook, Set(WebHook.Push), account, true)
+ } getOrElse NotFound()
+ })
+
+ /**
+ * Add the account web hook URL.
+ */
+ post("/:userName/_hooks/new", accountWebHookForm(false))(oneselfOnly { form =>
+ val userName = params("userName")
+ addAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
+ flash += "info" -> s"Webhook ${form.url} created"
+ redirect(s"/${userName}/_hooks")
+ })
+
+ /**
+ * Delete the account web hook URL.
+ */
+ get("/:userName/_hooks/delete")(oneselfOnly {
+ val userName = params("userName")
+ deleteAccountWebHook(userName, params("url"))
+ flash += "info" -> s"Webhook ${params("url")} deleted"
+ redirect(s"/${userName}/_hooks")
+ })
+
+ /**
+ * Display the account web hook edit page.
+ */
+ get("/:userName/_hooks/edit")(oneselfOnly {
+ val userName = params("userName")
+ getAccountByUserName(userName).flatMap { account =>
+ getAccountWebHook(userName, params("url")).map { case (webhook, events) =>
+ html.edithook(webhook, events, account, false)
+ }
+ } getOrElse NotFound()
+ })
+
+ /**
+ * Update account web hook settings.
+ */
+ post("/:userName/_hooks/edit", accountWebHookForm(true))(oneselfOnly { form =>
+ val userName = params("userName")
+ updateAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
+ flash += "info" -> s"webhook ${form.url} updated"
+ redirect(s"/${userName}/_hooks")
+ })
+
+ /**
+ * Send the test request to registered account web hook URLs.
+ */
+ ajaxPost("/:userName/_hooks/test")(oneselfOnly {
+ // TODO Is it possible to merge with [[RepositorySettingsController.ajaxPost]]?
+ import scala.concurrent.duration._
+ import scala.concurrent._
+ import scala.util.control.NonFatal
+ import org.apache.http.util.EntityUtils
+ import scala.concurrent.ExecutionContext.Implicits.global
+
+ def _headers(h: Array[org.apache.http.Header]): Array[Array[String]] = h.map { h => Array(h.getName, h.getValue) }
+
+ val userName = params("userName")
+ val url = params("url")
+ val token = Some(params("token"))
+ val ctype = WebHookContentType.valueOf(params("ctype"))
+ val dummyWebHookInfo = RepositoryWebHook(userName, "dummy", url, ctype, token)
+ val dummyPayload = {
+ val ownerAccount = getAccountByUserName(userName).get
+ WebHookPushPayload.createDummyPayload(ownerAccount)
+ }
+
+ val (webHook, json, reqFuture, resFuture) = callWebHook(WebHook.Push, List(dummyWebHookInfo), dummyPayload).head
+
+ val toErrorMap: PartialFunction[Throwable, Map[String,String]] = {
+ case e: java.net.UnknownHostException => Map("error"-> ("Unknown host " + e.getMessage))
+ case e: java.lang.IllegalArgumentException => Map("error"-> ("invalid url"))
+ case e: org.apache.http.client.ClientProtocolException => Map("error"-> ("invalid url"))
+ case NonFatal(e) => Map("error"-> (e.getClass + " "+ e.getMessage))
+ }
+
+ contentType = formats("json")
+ org.json4s.jackson.Serialization.write(Map(
+ "url" -> url,
+ "request" -> Await.result(reqFuture.map(req => Map(
+ "headers" -> _headers(req.getAllHeaders),
+ "payload" -> json
+ )).recover(toErrorMap), 20 seconds),
+ "response" -> Await.result(resFuture.map(res => Map(
+ "status" -> res.getStatusLine(),
+ "body" -> EntityUtils.toString(res.getEntity()),
+ "headers" -> _headers(res.getAllHeaders())
+ )).recover(toErrorMap), 20 seconds)
+ ))
+ })
+
get("/register"){
if(context.settings.allowAccountRegistration){
if(context.loginAccount.isDefined){
@@ -288,7 +440,7 @@
}
get("/groups/new")(usersOnly {
- html.group(None, List(GroupMember("", context.loginAccount.get.userName, true)))
+ html.creategroup(List(GroupMember("", context.loginAccount.get.userName, true)))
})
post("/groups/new", newGroupForm)(usersOnly { form =>
@@ -304,7 +456,10 @@
get("/:groupName/_editgroup")(managersOnly {
defining(params("groupName")){ groupName =>
- html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+ // TODO Don't use Option.get
+ getAccountByUserName(groupName, true).map { account =>
+ html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
+ } getOrElse NotFound()
}
})
@@ -312,13 +467,17 @@
defining(params("groupName")){ groupName =>
// Remove from GROUP_MEMBER
updateGroupMembers(groupName, Nil)
- // Remove repositories
- getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
- deleteRepository(groupName, repositoryName)
- FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
- FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
- FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+ // Disable group
+ getAccountByUserName(groupName, false).foreach { account =>
+ updateGroup(groupName, account.description, account.url, true)
}
+// // Remove repositories
+// getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
+// deleteRepository(groupName, repositoryName)
+// FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+// FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+// FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+// }
}
redirect("/")
})
@@ -343,7 +502,9 @@
// }
updateImage(form.groupName, form.fileId, form.clearImage)
- redirect(s"/${form.groupName}")
+
+ flash += "info" -> "Account information has been updated."
+ redirect(s"/${groupName}/_editgroup")
} getOrElse NotFound()
}
@@ -433,16 +594,23 @@
// Insert default labels
insertDefaultLabels(accountName, repository.name)
+ // Insert default priorities
+ insertDefaultPriorities(accountName, repository.name)
// clone repository actually
JGitUtil.cloneRepository(
getRepositoryDir(repository.owner, repository.name),
- getRepositoryDir(accountName, repository.name))
+ FileUtil.deleteIfExists(getRepositoryDir(accountName, repository.name)))
// Create Wiki repository
- JGitUtil.cloneRepository(
- getWikiRepositoryDir(repository.owner, repository.name),
- getWikiRepositoryDir(accountName, repository.name))
+ JGitUtil.cloneRepository(getWikiRepositoryDir(repository.owner, repository.name),
+ FileUtil.deleteIfExists(getWikiRepositoryDir(accountName, repository.name)))
+
+ // Copy LFS files
+ val lfsDir = getLfsDir(repository.owner, repository.name)
+ if(lfsDir.exists){
+ FileUtils.copyDirectory(lfsDir, FileUtil.deleteIfExists(getLfsDir(accountName, repository.name)))
+ }
// Record activity
recordForkActivity(repository.owner, repository.name, loginUserName, accountName)
diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala
index e873ae2..9da265e 100644
--- a/src/main/scala/gitbucket/core/controller/ApiController.scala
+++ b/src/main/scala/gitbucket/core/controller/ApiController.scala
@@ -33,6 +33,7 @@
with WebHookIssueCommentService
with WikiService
with ActivityService
+ with PrioritiesService
with OwnerAuthenticator
with UsersAuthenticator
with GroupManagerAuthenticator
@@ -52,6 +53,7 @@
with RepositoryCreationService
with IssueCreationService
with HandleCommentService
+ with PrioritiesService
with OwnerAuthenticator
with UsersAuthenticator
with GroupManagerAuthenticator
@@ -365,6 +367,7 @@
data.body,
data.assignees.headOption,
milestone.map(_.milestoneId),
+ None,
data.labels,
loginAccount)
JsonFormat(ApiIssue(issue, RepositoryName(repository), ApiUser(loginAccount)))
diff --git a/src/main/scala/gitbucket/core/controller/FileUploadController.scala b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
index cff4ceb..9f27caa 100644
--- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala
+++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
@@ -22,7 +22,12 @@
*/
class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService {
- configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))
+ val maxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null)
+ System.getProperty("gitbucket.maxFileSize").toLong
+ else
+ 3 * 1024 * 1024
+
+ configureMultipartHandling(MultipartConfig(maxFileSize = Some(maxFileSize)))
post("/image"){
execute({ (file, fileId) =>
@@ -31,6 +36,13 @@
}, FileUtil.isImage)
}
+ post("/tmp"){
+ execute({ (file, fileId) =>
+ FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+ session += Keys.Session.Upload(fileId) -> file.name
+ }, _ => true)
+ }
+
post("/file/:owner/:repository"){
execute({ (file, fileId) =>
FileUtils.writeByteArrayToFile(new java.io.File(
diff --git a/src/main/scala/gitbucket/core/controller/IssuesController.scala b/src/main/scala/gitbucket/core/controller/IssuesController.scala
index eeb19ac..9bebbfc 100644
--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -27,6 +27,7 @@
with PullRequestService
with WebHookIssueCommentService
with CommitsService
+ with PrioritiesService
trait IssuesControllerBase extends ControllerBase {
self: IssuesService
@@ -41,10 +42,11 @@
with ReferrerAuthenticator
with WritableUsersAuthenticator
with PullRequestService
- with WebHookIssueCommentService =>
+ with WebHookIssueCommentService
+ with PrioritiesService =>
case class IssueCreateForm(title: String, content: Option[String],
- assignedUserName: Option[String], milestoneId: Option[Int], labelNames: Option[String])
+ assignedUserName: Option[String], milestoneId: Option[Int], priorityId: Option[Int], labelNames: Option[String])
case class CommentForm(issueId: Int, content: String)
case class IssueStateForm(issueId: Int, content: Option[String])
@@ -53,6 +55,7 @@
"content" -> trim(optional(text())),
"assignedUserName" -> trim(optional(text())),
"milestoneId" -> trim(optional(number())),
+ "priorityId" -> trim(optional(number())),
"labelNames" -> trim(optional(text()))
)(IssueCreateForm.apply)
@@ -76,7 +79,7 @@
get("/:owner/:repository/issues")(referrersOnly { repository =>
val q = request.getParameter("q")
if(Option(q).exists(_.contains("is:pr"))){
- redirect(s"/${repository.owner}/${repository.name}/pulls?q=" + StringUtil.urlEncode(q))
+ redirect(s"/${repository.owner}/${repository.name}/pulls?q=${StringUtil.urlEncode(q)}")
} else {
searchIssues(repository)
}
@@ -84,17 +87,22 @@
get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
- getIssue(owner, name, issueId) map {
- html.issue(
- _,
- getComments(owner, name, issueId.toInt),
- getIssueLabels(owner, name, issueId.toInt),
- getAssignableUserNames(owner, name),
- getMilestonesWithIssueCount(owner, name),
- getLabels(owner, name),
- isIssueEditable(repository),
- isIssueManageable(repository),
- repository)
+ getIssue(owner, name, issueId) map { issue =>
+ if(issue.isPullRequest){
+ redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+ } else {
+ html.issue(
+ issue,
+ getComments(owner, name, issueId.toInt),
+ getIssueLabels(owner, name, issueId.toInt),
+ getAssignableUserNames(owner, name),
+ getMilestonesWithIssueCount(owner, name),
+ getPriorities(owner, name),
+ getLabels(owner, name),
+ isIssueEditable(repository),
+ isIssueManageable(repository),
+ repository)
+ }
} getOrElse NotFound()
}
})
@@ -105,6 +113,8 @@
html.create(
getAssignableUserNames(owner, name),
getMilestones(owner, name),
+ getPriorities(owner, name),
+ getDefaultPriority(owner, name),
getLabels(owner, name),
isIssueManageable(repository),
getContentTemplate(repository, "ISSUE_TEMPLATE"),
@@ -121,6 +131,7 @@
form.content,
form.assignedUserName,
form.milestoneId,
+ form.priorityId,
form.labelNames.toArray.flatMap(_.split(",")),
context.loginAccount.get)
@@ -287,6 +298,11 @@
} getOrElse Ok()
})
+ ajaxPost("/:owner/:repository/issues/:id/priority")(writableUsersOnly { repository =>
+ updatePriorityId(repository.owner, repository.name, params("id").toInt, priorityId("priorityId"))
+ Ok("updated")
+ })
+
post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
defining(params.get("value")){ action =>
action match {
@@ -331,6 +347,14 @@
}
})
+ post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
+ defining(priorityId("value")){ value =>
+ executeBatch(repository) {
+ updatePriorityId(repository.owner, repository.name, _, value)
+ }
+ }
+ })
+
get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
(Directory.getAttachedDir(repository.owner, repository.name) match {
case dir if(dir.exists && dir.isDirectory) =>
@@ -344,6 +368,7 @@
val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
+ val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
params("checked").split(',') map(_.toInt) foreach execute
@@ -366,6 +391,7 @@
page,
getAssignableUserNames(owner, repoName),
getMilestones(owner, repoName),
+ getPriorities(owner, repoName),
getLabels(owner, repoName),
countIssue(condition.copy(state = "open" ), false, owner -> repoName),
countIssue(condition.copy(state = "closed"), false, owner -> repoName),
diff --git a/src/main/scala/gitbucket/core/controller/PrioritiesController.scala b/src/main/scala/gitbucket/core/controller/PrioritiesController.scala
new file mode 100644
index 0000000..e0e010a
--- /dev/null
+++ b/src/main/scala/gitbucket/core/controller/PrioritiesController.scala
@@ -0,0 +1,111 @@
+package gitbucket.core.controller
+
+import gitbucket.core.issues.priorities.html
+import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, PrioritiesService}
+import gitbucket.core.util.{ReferrerAuthenticator, WritableUsersAuthenticator}
+import gitbucket.core.util.Implicits._
+import io.github.gitbucket.scalatra.forms._
+import org.scalatra.i18n.Messages
+import org.scalatra.Ok
+
+class PrioritiesController extends PrioritiesControllerBase
+ with PrioritiesService with IssuesService with RepositoryService with AccountService
+with ReferrerAuthenticator with WritableUsersAuthenticator
+
+trait PrioritiesControllerBase extends ControllerBase {
+ self: PrioritiesService with IssuesService with RepositoryService
+ with ReferrerAuthenticator with WritableUsersAuthenticator =>
+
+ case class PriorityForm(priorityName: String, description: Option[String], color: String)
+
+ val priorityForm = mapping(
+ "priorityName" -> trim(label("Priority name", text(required, priorityName, uniquePriorityName, maxlength(100)))),
+ "description" -> trim(label("Description", optional(text(maxlength(255))))),
+ "priorityColor" -> trim(label("Color", text(required, color)))
+ )(PriorityForm.apply)
+
+
+ get("/:owner/:repository/issues/priorities")(referrersOnly { repository =>
+ html.list(
+ getPriorities(repository.owner, repository.name),
+ countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+ repository,
+ hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+ })
+
+ ajaxGet("/:owner/:repository/issues/priorities/new")(writableUsersOnly { repository =>
+ html.edit(None, repository)
+ })
+
+ ajaxPost("/:owner/:repository/issues/priorities/new", priorityForm)(writableUsersOnly { (form, repository) =>
+ val priorityId = createPriority(repository.owner, repository.name, form.priorityName, form.description, form.color.substring(1))
+ html.priority(
+ getPriority(repository.owner, repository.name, priorityId).get,
+ countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+ repository,
+ hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+ })
+
+ ajaxGet("/:owner/:repository/issues/priorities/:priorityId/edit")(writableUsersOnly { repository =>
+ getPriority(repository.owner, repository.name, params("priorityId").toInt).map { priority =>
+ html.edit(Some(priority), repository)
+ } getOrElse NotFound()
+ })
+
+ ajaxPost("/:owner/:repository/issues/priorities/:priorityId/edit", priorityForm)(writableUsersOnly { (form, repository) =>
+ updatePriority(repository.owner, repository.name, params("priorityId").toInt, form.priorityName, form.description, form.color.substring(1))
+ html.priority(
+ getPriority(repository.owner, repository.name, params("priorityId").toInt).get,
+ countIssueGroupByPriorities(repository.owner, repository.name, IssuesService.IssueSearchCondition(), Map.empty),
+ repository,
+ hasDeveloperRole(repository.owner, repository.name, context.loginAccount))
+ })
+
+ ajaxPost("/:owner/:repository/issues/priorities/reorder")(writableUsersOnly { (repository) =>
+ reorderPriorities(repository.owner, repository.name, params("order")
+ .split(",")
+ .map(id => id.toInt)
+ .zipWithIndex
+ .toMap)
+
+ Ok()
+ })
+
+ ajaxPost("/:owner/:repository/issues/priorities/default")(writableUsersOnly { (repository) =>
+ setDefaultPriority(repository.owner, repository.name, priorityId("priorityId"))
+ Ok()
+ })
+
+ ajaxPost("/:owner/:repository/issues/priorities/:priorityId/delete")(writableUsersOnly { repository =>
+ deletePriority(repository.owner, repository.name, params("priorityId").toInt)
+ Ok()
+ })
+
+ val priorityId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
+
+ /**
+ * Constraint for the identifier such as user name, repository name or page name.
+ */
+ private def priorityName: Constraint = new Constraint(){
+ override def validate(name: String, value: String, messages: Messages): Option[String] =
+ if(value.contains(',')){
+ Some(s"${name} contains invalid character.")
+ } else if(value.startsWith("_") || value.startsWith("-")){
+ Some(s"${name} starts with invalid character.")
+ } else {
+ None
+ }
+ }
+
+ private def uniquePriorityName: Constraint = new Constraint(){
+ override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = {
+ val owner = params("owner")
+ val repository = params("repository")
+ params.get("priorityId").map { priorityId =>
+ getPriority(owner, repository, value).filter(_.priorityId != priorityId.toInt).map(_ => "Name has already been taken.")
+ }.getOrElse {
+ getPriority(owner, repository, value).map(_ => "Name has already been taken.")
+ }
+ }
+ }
+}
diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
index cf8c49b..88328e1 100644
--- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
@@ -1,6 +1,7 @@
package gitbucket.core.controller
import gitbucket.core.model.WebHook
+import gitbucket.core.plugin.PluginRegistry
import gitbucket.core.pulls.html
import gitbucket.core.service.CommitStatusService
import gitbucket.core.service.MergeService
@@ -23,14 +24,14 @@
with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
with CommitsService with ActivityService with WebHookPullRequestService
with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
- with CommitStatusService with MergeService with ProtectedBranchService
+ with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService
trait PullRequestsControllerBase extends ControllerBase {
self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
with CommitsService with ActivityService with PullRequestService with WebHookPullRequestService
with ReadableUsersAuthenticator with ReferrerAuthenticator with WritableUsersAuthenticator
- with CommitStatusService with MergeService with ProtectedBranchService =>
+ with CommitStatusService with MergeService with ProtectedBranchService with PrioritiesService =>
val pullRequestForm = mapping(
"title" -> trim(label("Title" , text(required, maxlength(100)))),
@@ -44,6 +45,7 @@
"commitIdTo" -> trim(text(required, maxlength(40))),
"assignedUserName" -> trim(optional(text())),
"milestoneId" -> trim(optional(number())),
+ "priorityId" -> trim(optional(number())),
"labelNames" -> trim(optional(text()))
)(PullRequestForm.apply)
@@ -63,6 +65,7 @@
commitIdTo: String,
assignedUserName: Option[String],
milestoneId: Option[Int],
+ priorityId: Option[Int],
labelNames: Option[String]
)
@@ -92,12 +95,15 @@
getIssueLabels(owner, name, issueId),
getAssignableUserNames(owner, name),
getMilestonesWithIssueCount(owner, name),
+ getPriorities(owner, name),
getLabels(owner, name),
commits,
diffs,
isEditable(repository),
isManageable(repository),
+ hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
repository,
+ getRepository(pullreq.requestUserName, pullreq.requestRepositoryName),
flash.toMap.map(f => f._1 -> f._2.toString))
}
}
@@ -138,22 +144,36 @@
} getOrElse NotFound()
})
- get("/:owner/:repository/pull/:id/delete/*")(writableUsersOnly { repository =>
- params("id").toIntOpt.map { issueId =>
- val branchName = multiParams("splat").head
- val userName = context.loginAccount.get.userName
- if(repository.repository.defaultBranch != branchName){
- using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
- git.branchDelete().setForce(true).setBranchNames(branchName).call()
- recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
+ get("/:owner/:repository/pull/:id/delete_branch")(readableUsersOnly { baseRepository =>
+ (for {
+ issueId <- params("id").toIntOpt
+ loginAccount <- context.loginAccount
+ (issue, pullreq) <- getPullRequest(baseRepository.owner, baseRepository.name, issueId)
+ owner = pullreq.requestUserName
+ name = pullreq.requestRepositoryName
+ if hasDeveloperRole(owner, name, context.loginAccount)
+ } yield {
+ val repository = getRepository(owner, name).get
+ val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
+ if(branchProtection.enabled){
+ flash += "error" -> s"branch ${pullreq.requestBranch} is protected."
+ } else {
+ if(repository.repository.defaultBranch != pullreq.requestBranch){
+ val userName = context.loginAccount.get.userName
+ using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+ git.branchDelete().setForce(true).setBranchNames(pullreq.requestBranch).call()
+ recordDeleteBranchActivity(repository.owner, repository.name, userName, pullreq.requestBranch)
+ }
+ createComment(baseRepository.owner, baseRepository.name, userName, issueId, pullreq.requestBranch, "delete_branch")
+ } else {
+ flash += "error" -> s"""Can't delete the default branch "${pullreq.requestBranch}"."""
}
}
- createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch")
- redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
- } getOrElse NotFound()
+ redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}")
+ }) getOrElse NotFound()
})
- post("/:owner/:repository/pull/:id/update_branch")(writableUsersOnly { baseRepository =>
+ post("/:owner/:repository/pull/:id/update_branch")(readableUsersOnly { baseRepository =>
(for {
issueId <- params("id").toIntOpt
loginAccount <- context.loginAccount
@@ -217,7 +237,7 @@
}
}
}
- redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+ redirect(s"/${baseRepository.owner}/${baseRepository.name}/pull/${issueId}")
}) getOrElse NotFound()
})
@@ -261,10 +281,8 @@
// call web hook
callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get)
- // notifications
- Notifier().toNotify(repository, issue, "merge"){
- Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
- }
+ // call hooks
+ PluginRegistry().getPullRequestHooks.foreach(_.merged(issue, repository))
redirect(s"/${owner}/${name}/pull/${issueId}")
}
@@ -359,10 +377,10 @@
title,
commits,
diffs,
- (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
+ ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
case (Some(userName), Some(repositoryName)) => (userName, repositoryName) :: getForkedRepositories(userName, repositoryName)
case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
- },
+ }).filter { case (owner, name) => hasGuestRole(owner, name, context.loginAccount) },
commits.flatten.map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)).flatten.toList,
originId,
forkedId,
@@ -375,6 +393,7 @@
hasDeveloperRole(originRepository.owner, originRepository.name, context.loginAccount),
getAssignableUserNames(originRepository.owner, originRepository.name),
getMilestones(originRepository.owner, originRepository.name),
+ getPriorities(originRepository.owner, originRepository.name),
getLabels(originRepository.owner, originRepository.name)
)
}
@@ -430,6 +449,7 @@
content = form.content,
assignedUserName = if (manageable) form.assignedUserName else None,
milestoneId = if (manageable) form.milestoneId else None,
+ priorityId = if (manageable) form.priorityId else None,
isPullRequest = true)
createPullRequest(
@@ -468,10 +488,8 @@
// extract references and create refer comment
createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""), context.loginAccount.get)
- // notifications
- Notifier().toNotify(repository, issue, form.content.getOrElse("")) {
- Notifier.msgPullRequest(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
- }
+ // call hooks
+ PluginRegistry().getPullRequestHooks.foreach(_.created(issue, repository))
}
redirect(s"/${owner}/${name}/pull/${issueId}")
@@ -505,6 +523,7 @@
page,
getAssignableUserNames(owner, repoName),
getMilestones(owner, repoName),
+ getPriorities(owner, repoName),
getLabels(owner, repoName),
countIssue(condition.copy(state = "open" ), true, owner -> repoName),
countIssue(condition.copy(state = "closed"), true, owner -> repoName),
diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
index 4fc7974..4ef39e3 100644
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -1,7 +1,7 @@
package gitbucket.core.controller
import gitbucket.core.settings.html
-import gitbucket.core.model.WebHook
+import gitbucket.core.model.{WebHook, RepositoryWebHook}
import gitbucket.core.service._
import gitbucket.core.service.WebHookService._
import gitbucket.core.util._
@@ -133,21 +133,12 @@
FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
}
}
- // Move lfs directory
- defining(getLfsDir(repository.owner, repository.name)){ dir =>
+ // Move files directory
+ defining(getRepositoryFilesDir(repository.owner, repository.name)){ dir =>
if(dir.isDirectory) {
- FileUtils.moveDirectory(dir, getLfsDir(repository.owner, form.repositoryName))
+ FileUtils.moveDirectory(dir, getRepositoryFilesDir(repository.owner, form.repositoryName))
}
}
- // Move attached directory
- defining(getAttachedDir(repository.owner, repository.name)){ dir =>
- if(dir.isDirectory) {
- FileUtils.moveDirectory(dir, getAttachedDir(repository.owner, form.repositoryName))
- }
- }
- // Delete parent directory
- FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))
-
// Call hooks
PluginRegistry().getRepositoryHooks.foreach(_.renamed(repository.owner, repository.name, form.repositoryName))
}
@@ -221,8 +212,8 @@
* Display the web hook edit page.
*/
get("/:owner/:repository/settings/hooks/new")(ownerOnly { repository =>
- val webhook = WebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
- html.edithooks(webhook, Set(WebHook.Push), repository, flash.get("info"), true)
+ val webhook = RepositoryWebHook(repository.owner, repository.name, "", WebHookContentType.FORM, None)
+ html.edithook(webhook, Set(WebHook.Push), repository, true)
})
/**
@@ -260,7 +251,7 @@
val url = params("url")
val token = Some(params("token"))
val ctype = WebHookContentType.valueOf(params("ctype"))
- val dummyWebHookInfo = WebHook(repository.owner, repository.name, url, ctype, token)
+ val dummyWebHookInfo = RepositoryWebHook(repository.owner, repository.name, url, ctype, token)
val dummyPayload = {
val ownerAccount = getAccountByUserName(repository.owner).get
val commits = if(JGitUtil.isEmpty(git)) List.empty else git.log
@@ -297,7 +288,7 @@
"headers" -> _headers(req.getAllHeaders),
"payload" -> json
)).recover(toErrorMap), 20 seconds),
- "responce" -> Await.result(resFuture.map(res => Map(
+ "response" -> Await.result(resFuture.map(res => Map(
"status" -> res.getStatusLine(),
"body" -> EntityUtils.toString(res.getEntity()),
"headers" -> _headers(res.getAllHeaders())
@@ -311,7 +302,7 @@
*/
get("/:owner/:repository/settings/hooks/edit")(ownerOnly { repository =>
getWebHook(repository.owner, repository.name, params("url")).map{ case (webhook, events) =>
- html.edithooks(webhook, events, repository, flash.get("info"), false)
+ html.edithook(webhook, events, repository, false)
} getOrElse NotFound()
})
@@ -364,7 +355,7 @@
FileUtils.moveDirectory(dir, getAttachedDir(form.newOwner, repository.name))
}
}
- // Delere parent directory
+ // Delete parent directory
FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))
// Call hooks
diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
index 6fc90d7..b116100 100644
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -1,6 +1,6 @@
package gitbucket.core.controller
-import java.io.FileInputStream
+import java.io.File
import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
import gitbucket.core.plugin.PluginRegistry
@@ -18,15 +18,14 @@
import gitbucket.core.view
import gitbucket.core.view.helpers
import io.github.gitbucket.scalatra.forms._
-import org.apache.commons.io.IOUtils
+import org.apache.commons.io.FileUtils
import org.eclipse.jgit.api.{ArchiveCommand, Git}
import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
-import org.eclipse.jgit.dircache.DirCache
+import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
import org.eclipse.jgit.errors.MissingObjectException
import org.eclipse.jgit.lib._
-import org.eclipse.jgit.revwalk.RevCommit
-import org.eclipse.jgit.treewalk._
import org.scalatra._
+import org.scalatra.i18n.Messages
class RepositoryViewerController extends RepositoryViewerControllerBase
@@ -45,6 +44,13 @@
ArchiveCommand.registerFormat("zip", new ZipFormat)
ArchiveCommand.registerFormat("tar.gz", new TgzFormat)
+ case class UploadForm(
+ branch: String,
+ path: String,
+ uploadFiles: String,
+ message: Option[String]
+ )
+
case class EditorForm(
branch: String,
path: String,
@@ -53,14 +59,16 @@
charset: String,
lineSeparator: String,
newFileName: String,
- oldFileName: Option[String]
+ oldFileName: Option[String],
+ commit: String
)
case class DeleteForm(
branch: String,
path: String,
message: Option[String],
- fileName: String
+ fileName: String,
+ commit: String
)
case class CommentForm(
@@ -71,6 +79,13 @@
issueId: Option[Int]
)
+ val uploadForm = mapping(
+ "branch" -> trim(label("Branch", text(required))),
+ "path" -> trim(label("Path", text())),
+ "uploadFiles" -> trim(label("Upload files", text(required))),
+ "message" -> trim(label("Message", optional(text()))),
+ )(UploadForm.apply)
+
val editorForm = mapping(
"branch" -> trim(label("Branch", text(required))),
"path" -> trim(label("Path", text())),
@@ -79,14 +94,16 @@
"charset" -> trim(label("Charset", text(required))),
"lineSeparator" -> trim(label("Line Separator", text(required))),
"newFileName" -> trim(label("Filename", text(required))),
- "oldFileName" -> trim(label("Old filename", optional(text())))
+ "oldFileName" -> trim(label("Old filename", optional(text()))),
+ "commit" -> trim(label("Commit", text(required, conflict)))
)(EditorForm.apply)
val deleteForm = mapping(
"branch" -> trim(label("Branch", text(required))),
"path" -> trim(label("Path", text())),
"message" -> trim(label("Message", optional(text()))),
- "fileName" -> trim(label("Filename", text(required)))
+ "fileName" -> trim(label("Filename", text(required))),
+ "commit" -> trim(label("Commit", text(required, conflict)))
)(DeleteForm.apply)
val commentForm = mapping(
@@ -172,11 +189,50 @@
get("/:owner/:repository/new/*")(writableUsersOnly { repository =>
val (branch, path) = repository.splitPath(multiParams("splat").head)
val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
- html.editor(branch, repository, if(path.length == 0) Nil else path.split("/").toList,
- None, JGitUtil.ContentInfo("text", None, None, Some("UTF-8")),
- protectedBranch)
+
+ using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+ val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+
+ html.editor(
+ branch = branch,
+ repository = repository,
+ pathList = if (path.length == 0) Nil else path.split("/").toList,
+ fileName = None,
+ content = JGitUtil.ContentInfo("text", None, None, Some("UTF-8")),
+ protectedBranch = protectedBranch,
+ commit = revCommit.getName
+ )
+ }
})
+ get("/:owner/:repository/upload/*")(writableUsersOnly { repository =>
+ val (branch, path) = repository.splitPath(multiParams("splat").head)
+ val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
+ html.upload(branch, repository, if(path.length == 0) Nil else path.split("/").toList, protectedBranch)
+ })
+
+ post("/:owner/:repository/upload", uploadForm)(writableUsersOnly { (form, repository) =>
+ val files = form.uploadFiles.split("\n").map { line =>
+ val i = line.indexOf(":")
+ CommitFile(line.substring(0, i).trim, line.substring(i + 1).trim)
+ }
+
+ commitFiles(
+ repository = repository,
+ branch = form.branch,
+ path = form.path,
+ files = files,
+ message = form.message.getOrElse(s"Add files via upload")
+ )
+
+ if(form.path.length == 0){
+ redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}")
+ } else {
+ redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}/${form.path}")
+ }
+ })
+
+
get("/:owner/:repository/edit/*")(writableUsersOnly { repository =>
val (branch, path) = repository.splitPath(multiParams("splat").head)
val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
@@ -186,9 +242,15 @@
getPathObjectId(git, path, revCommit).map { objectId =>
val paths = path.split("/")
- html.editor(branch, repository, paths.take(paths.size - 1).toList, Some(paths.last),
- JGitUtil.getContentInfo(git, path, objectId),
- protectedBranch)
+ html.editor(
+ branch = branch,
+ repository = repository,
+ pathList = paths.take(paths.size - 1).toList,
+ fileName = Some(paths.last),
+ content = JGitUtil.getContentInfo(git, path, objectId),
+ protectedBranch = protectedBranch,
+ commit = revCommit.getName
+ )
} getOrElse NotFound()
}
})
@@ -200,8 +262,14 @@
getPathObjectId(git, path, revCommit).map { objectId =>
val paths = path.split("/")
- html.delete(branch, repository, paths.take(paths.size - 1).toList, paths.last,
- JGitUtil.getContentInfo(git, path, objectId))
+ html.delete(
+ branch = branch,
+ repository = repository,
+ pathList = paths.take(paths.size - 1).toList,
+ fileName = paths.last,
+ content = JGitUtil.getContentInfo(git, path, objectId),
+ commit = revCommit.getName
+ )
} getOrElse NotFound()
}
})
@@ -215,7 +283,8 @@
oldFileName = None,
content = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
charset = form.charset,
- message = form.message.getOrElse(s"Create ${form.newFileName}")
+ message = form.message.getOrElse(s"Create ${form.newFileName}"),
+ commit = form.commit
)
redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
@@ -232,21 +301,31 @@
oldFileName = form.oldFileName,
content = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator),
charset = form.charset,
- message = if(form.oldFileName.contains(form.newFileName)){
+ message = if (form.oldFileName.contains(form.newFileName)) {
form.message.getOrElse(s"Update ${form.newFileName}")
} else {
form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
- }
+ },
+ commit = form.commit
)
redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
- if(form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
+ if (form.path.length == 0) urlEncode(form.newFileName) else s"${form.path}/${urlEncode(form.newFileName)}"
}")
})
post("/:owner/:repository/remove", deleteForm)(writableUsersOnly { (form, repository) =>
- commitFile(repository, form.branch, form.path, None, Some(form.fileName), "", "",
- form.message.getOrElse(s"Delete ${form.fileName}"))
+ commitFile(
+ repository = repository,
+ branch = form.branch,
+ path = form.path,
+ newFileName = None,
+ oldFileName = Some(form.fileName),
+ content = "",
+ charset = "",
+ message = form.message.getOrElse(s"Delete ${form.fileName}"),
+ commit = form.commit
+ )
redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}${if(form.path.length == 0) "" else form.path}")
})
@@ -275,12 +354,16 @@
// Download (This route is left for backword compatibility)
responseRawFile(git, objectId, path, repository)
} else {
- html.blob(id, repository, path.split("/").toList,
- JGitUtil.getContentInfo(git, path, objectId),
- new JGitUtil.CommitInfo(JGitUtil.getLastModifiedCommit(git, revCommit, path)),
- hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
- request.paths(2) == "blame",
- isLfsFile(git, objectId))
+ html.blob(
+ branch = id,
+ repository = repository,
+ pathList = path.split("/").toList,
+ content = JGitUtil.getContentInfo(git, path, objectId),
+ latestCommit = new JGitUtil.CommitInfo(JGitUtil.getLastModifiedCommit(git, revCommit, path)),
+ hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+ isBlame = request.paths(2) == "blame",
+ isLfsFile = isLfsFile(git, objectId)
+ )
}
} getOrElse NotFound()
}
@@ -547,6 +630,116 @@
}
})
+ case class UploadFiles(branch: String, path: String, fileIds : Map[String,String], message: String) {
+ lazy val isValid: Boolean = fileIds.size > 0
+ }
+
+ case class CommitFile(id: String, name: String)
+
+ private def commitFiles(repository: RepositoryService.RepositoryInfo,
+ files: Seq[CommitFile],
+ branch: String, path: String, message: String) = {
+ // prepend path to the filename
+ val newFiles = files.map { file =>
+ file.copy(name = if(path.length == 0) file.name else s"${path}/${file.name}")
+ }
+
+ _commitFile(repository, branch, message) { case (git, headTip, builder, inserter) =>
+ JGitUtil.processTree(git, headTip) { (path, tree) =>
+ if(!newFiles.exists(_.name.contains(path))) {
+ builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+ }
+ }
+
+ newFiles.foreach { file =>
+ val bytes = FileUtils.readFileToByteArray(new File(getTemporaryDir(session.getId), file.id))
+ builder.add(JGitUtil.createDirCacheEntry(file.name,
+ FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, bytes)))
+ builder.finish()
+ }
+ }
+ }
+
+ private def commitFile(repository: RepositoryService.RepositoryInfo,
+ branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
+ content: String, charset: String, message: String, commit: String) = {
+
+ val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
+ val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
+
+ _commitFile(repository, branch, message){ case (git, headTip, builder, inserter) =>
+ if(headTip.getName == commit){
+ val permission = JGitUtil.processTree(git, headTip) { (path, tree) =>
+ // Add all entries except the editing file
+ if (!newPath.contains(path) && !oldPath.contains(path)) {
+ builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+ }
+ // Retrieve permission if file exists to keep it
+ oldPath.collect { case x if x == path => tree.getEntryFileMode.getBits }
+ }.flatten.headOption
+
+ newPath.foreach { newPath =>
+ builder.add(JGitUtil.createDirCacheEntry(newPath,
+ permission.map { bits => FileMode.fromBits(bits) } getOrElse FileMode.REGULAR_FILE,
+ inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
+ }
+ builder.finish()
+ }
+ }
+ }
+
+ private def _commitFile(repository: RepositoryService.RepositoryInfo,
+ branch: String, message: String)(f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit) = {
+
+ LockUtil.lock(s"${repository.owner}/${repository.name}") {
+ using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+ val loginAccount = context.loginAccount.get
+ val builder = DirCache.newInCore.builder()
+ val inserter = git.getRepository.newObjectInserter()
+ val headName = s"refs/heads/${branch}"
+ val headTip = git.getRepository.resolve(headName)
+
+ f(git, headTip, builder, inserter)
+
+ val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
+ headName, loginAccount.userName, loginAccount.mailAddress, message)
+
+ inserter.flush()
+ inserter.close()
+
+ // update refs
+ val refUpdate = git.getRepository.updateRef(headName)
+ refUpdate.setNewObjectId(commitId)
+ refUpdate.setForceUpdate(false)
+ refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+ refUpdate.update()
+
+ // update pull request
+ updatePullRequests(repository.owner, repository.name, branch)
+
+ // record activity
+ val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+ recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
+
+ // create issue comment by commit message
+ createIssueComment(repository.owner, repository.name, commitInfo)
+
+ // close issue by commit message
+ closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
+
+ //call web hook
+ callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount)
+ val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+ callWebHookOf(repository.owner, repository.name, WebHook.Push) {
+ getAccountByUserName(repository.owner).map{ ownerAccount =>
+ WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
+ oldId = headTip, newId = commitId)
+ }
+ }
+ }
+ }
+ }
+
private val readmeFiles = PluginRegistry().renderableExtensions.map { extension =>
s"readme.${extension}"
} ++ Seq("readme.txt", "readme")
@@ -597,84 +790,13 @@
}
}
- private def commitFile(repository: RepositoryService.RepositoryInfo,
- branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
- content: String, charset: String, message: String) = {
-
- val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
- val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
-
- LockUtil.lock(s"${repository.owner}/${repository.name}"){
- using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
- val loginAccount = context.loginAccount.get
- val builder = DirCache.newInCore.builder()
- val inserter = git.getRepository.newObjectInserter()
- val headName = s"refs/heads/${branch}"
- val headTip = git.getRepository.resolve(headName)
-
- val permission = JGitUtil.processTree(git, headTip){ (path, tree) =>
- // Add all entries except the editing file
- if(!newPath.contains(path) && !oldPath.contains(path)){
- builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
- }
- // Retrieve permission if file exists to keep it
- oldPath.collect { case x if x == path => tree.getEntryFileMode.getBits }
- }.flatten.headOption
-
- newPath.foreach { newPath =>
- builder.add(JGitUtil.createDirCacheEntry(newPath,
- permission.map { bits => FileMode.fromBits(bits) } getOrElse FileMode.REGULAR_FILE,
- inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
- }
- builder.finish()
-
- val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
- headName, loginAccount.fullName, loginAccount.mailAddress, message)
-
- inserter.flush()
- inserter.close()
-
- // update refs
- val refUpdate = git.getRepository.updateRef(headName)
- refUpdate.setNewObjectId(commitId)
- refUpdate.setForceUpdate(false)
- refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
- //refUpdate.setRefLogMessage("merged", true)
- refUpdate.update()
-
- // update pull request
- updatePullRequests(repository.owner, repository.name, branch)
-
- // record activity
- val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
- recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
-
- // create issue comment by commit message
- createIssueComment(repository.owner, repository.name, commitInfo)
-
- // close issue by commit message
- closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
-
- // call web hook
- callPullRequestWebHookByRequestBranch("synchronize", repository, branch, context.baseUrl, loginAccount)
- val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
- callWebHookOf(repository.owner, repository.name, WebHook.Push) {
- getAccountByUserName(repository.owner).map{ ownerAccount =>
- WebHookPushPayload(git, loginAccount, headName, repository, List(commit), ownerAccount,
- oldId = headTip, newId = commitId)
- }
- }
- }
- }
- }
-
private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): Unit = {
val revision = name.stripSuffix(suffix)
-
+
using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
val oid = git.getRepository.resolve(revision)
val revCommit = JGitUtil.getRevCommitFromId(git, oid)
- val sha1 = oid.getName()
+ val sha1 = oid.getName()
val repositorySuffix = (if(sha1.startsWith(revision)) sha1 else revision).replace('/','-')
val filename = repository.name + "-" + repositorySuffix + suffix
@@ -694,6 +816,26 @@
private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+ private def conflict: Constraint = new Constraint(){
+ override def validate(name: String, value: String, messages: Messages): Option[String] = {
+ val owner = params("owner")
+ val repository = params("repository")
+ val branch = params("branch")
+
+ LockUtil.lock(s"${owner}/${repository}") {
+ using(Git.open(getRepositoryDir(owner, repository))) { git =>
+ val headName = s"refs/heads/${branch}"
+ val headTip = git.getRepository.resolve(headName)
+ if(headTip.getName != value){
+ Some("Someone pushed new commits before you. Please reload this page and re-apply your changes.")
+ } else {
+ None
+ }
+ }
+ }
+ }
+ }
+
override protected def renderUncaughtException(e: Throwable)(implicit request: HttpServletRequest, response: HttpServletResponse): Unit = {
e.printStackTrace()
}
diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
index 3dc9294..f25b481 100644
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -106,7 +106,7 @@
val newUserForm = mapping(
"userName" -> trim(label("Username" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))),
- "password" -> trim(label("Password" ,text(required, maxlength(20)))),
+ "password" -> trim(label("Password" ,text(required, maxlength(20), password))),
"fullName" -> trim(label("Full Name" ,text(required, maxlength(100)))),
"mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress()))),
"isAdmin" -> trim(label("User Type" ,boolean())),
@@ -117,7 +117,7 @@
val editUserForm = mapping(
"userName" -> trim(label("Username" ,text(required, maxlength(100), identifier))),
- "password" -> trim(label("Password" ,optional(text(maxlength(20))))),
+ "password" -> trim(label("Password" ,optional(text(maxlength(20), password)))),
"fullName" -> trim(label("Full Name" ,text(required, maxlength(100)))),
"mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress("userName")))),
"isAdmin" -> trim(label("User Type" ,boolean())),
@@ -241,7 +241,7 @@
// FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
// FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
// }
- // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+ // Remove from GROUP_MEMBER and COLLABORATOR
removeUserRelatedData(userName)
}
@@ -255,6 +255,10 @@
isRemoved = form.isRemoved))
updateImage(userName, form.fileId, form.clearImage)
+
+ // call hooks
+ if(form.isRemoved) PluginRegistry().getAccountHooks.foreach(_.deleted(userName))
+
redirect("/admin/users")
}
} getOrElse NotFound()
@@ -293,13 +297,13 @@
if(form.isRemoved){
// Remove from GROUP_MEMBER
updateGroupMembers(form.groupName, Nil)
- // Remove repositories
- getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
- deleteRepository(groupName, repositoryName)
- FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
- FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
- FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
- }
+// // Remove repositories
+// getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+// deleteRepository(groupName, repositoryName)
+// FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+// FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+// FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+// }
} else {
// Update GROUP_MEMBER
updateGroupMembers(form.groupName, members)
diff --git a/src/main/scala/gitbucket/core/controller/WikiController.scala b/src/main/scala/gitbucket/core/controller/WikiController.scala
index 49cc97d..d3f949f 100644
--- a/src/main/scala/gitbucket/core/controller/WikiController.scala
+++ b/src/main/scala/gitbucket/core/controller/WikiController.scala
@@ -1,8 +1,10 @@
package gitbucket.core.controller
+import gitbucket.core.model.WebHook
import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.service.WebHookService.WebHookGollumPayload
import gitbucket.core.wiki.html
-import gitbucket.core.service.{AccountService, ActivityService, RepositoryService, WikiService}
+import gitbucket.core.service._
import gitbucket.core.util._
import gitbucket.core.util.StringUtil._
import gitbucket.core.util.SyntaxSugars._
@@ -13,11 +15,12 @@
import org.scalatra.i18n.Messages
class WikiController extends WikiControllerBase
- with WikiService with RepositoryService with AccountService with ActivityService
+ with WikiService with RepositoryService with AccountService with ActivityService with WebHookService
with ReadableUsersAuthenticator with ReferrerAuthenticator
trait WikiControllerBase extends ControllerBase {
- self: WikiService with RepositoryService with ActivityService with ReadableUsersAuthenticator with ReferrerAuthenticator =>
+ self: WikiService with RepositoryService with AccountService with ActivityService with WebHookService
+ with ReadableUsersAuthenticator with ReferrerAuthenticator =>
case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)
@@ -136,6 +139,11 @@
).map { commitId =>
updateLastActivityDate(repository.owner, repository.name)
recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
+ callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+ getAccountByUserName(repository.owner).map { repositoryUser =>
+ WebHookGollumPayload("edited", form.pageName, commitId, repository, repositoryUser, loginAccount)
+ }
+ }
}
if(notReservedPageName(form.pageName)) {
redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
@@ -155,11 +163,24 @@
post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) =>
if(isEditable(repository)){
defining(context.loginAccount.get){ loginAccount =>
- saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
- form.content, loginAccount, form.message.getOrElse(""), None)
-
- updateLastActivityDate(repository.owner, repository.name)
- recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+ saveWikiPage(
+ repository.owner,
+ repository.name,
+ form.currentPageName,
+ form.pageName,
+ form.content,
+ loginAccount,
+ form.message.getOrElse(""),
+ None
+ ).map { commitId =>
+ updateLastActivityDate(repository.owner, repository.name)
+ recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+ callWebHookOf(repository.owner, repository.name, WebHook.Gollum){
+ getAccountByUserName(repository.owner).map { repositoryUser =>
+ WebHookGollumPayload("created", form.pageName, commitId, repository, repositoryUser, loginAccount)
+ }
+ }
+ }
if(notReservedPageName(form.pageName)) {
redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
diff --git a/src/main/scala/gitbucket/core/model/AccountWebHook.scala b/src/main/scala/gitbucket/core/model/AccountWebHook.scala
new file mode 100644
index 0000000..df28993
--- /dev/null
+++ b/src/main/scala/gitbucket/core/model/AccountWebHook.scala
@@ -0,0 +1,25 @@
+package gitbucket.core.model
+
+trait AccountWebHookComponent extends TemplateComponent { self: Profile =>
+ import profile.api._
+
+ private implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
+
+ lazy val AccountWebHooks = TableQuery[AccountWebHooks]
+
+ class AccountWebHooks(tag: Tag) extends Table[AccountWebHook](tag, "ACCOUNT_WEB_HOOK") with BasicTemplate {
+ val url = column[String]("URL")
+ val token = column[Option[String]]("TOKEN")
+ val ctype = column[WebHookContentType]("CTYPE")
+ def * = (userName, url, ctype, token) <> ((AccountWebHook.apply _).tupled, AccountWebHook.unapply)
+
+ def byPrimaryKey(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
+ }
+}
+
+case class AccountWebHook(
+ userName: String,
+ url: String,
+ ctype: WebHookContentType,
+ token: Option[String]
+) extends WebHook
diff --git a/src/main/scala/gitbucket/core/model/AccountWebHookEvent.scala b/src/main/scala/gitbucket/core/model/AccountWebHookEvent.scala
new file mode 100644
index 0000000..36ffa3c
--- /dev/null
+++ b/src/main/scala/gitbucket/core/model/AccountWebHookEvent.scala
@@ -0,0 +1,34 @@
+package gitbucket.core.model
+
+trait AccountWebHookEventComponent extends TemplateComponent {
+ self: Profile =>
+
+ import profile.api._
+ import gitbucket.core.model.Profile.AccountWebHooks
+
+ lazy val AccountWebHookEvents = TableQuery[AccountWebHookEvents]
+
+ class AccountWebHookEvents(tag: Tag) extends Table[AccountWebHookEvent](tag, "ACCOUNT_WEB_HOOK_EVENT") with BasicTemplate {
+ val url = column[String]("URL")
+ val event = column[WebHook.Event]("EVENT")
+
+ def * = (userName, url, event) <> ((AccountWebHookEvent.apply _).tupled, AccountWebHookEvent.unapply)
+
+ def byAccountWebHook(userName: String, url: String) = (this.userName === userName.bind) && (this.url === url.bind)
+
+ def byAccountWebHook(owner: Rep[String], url: Rep[String]) =
+ (this.userName === userName) && (this.url === url)
+
+ def byAccountWebHook(webhook: AccountWebHooks) =
+ (this.userName === webhook.userName) && (this.url === webhook.url)
+
+ def byPrimaryKey(userName: String, url: String, event: WebHook.Event) =
+ (this.userName === userName.bind) && (this.url === url.bind) && (this.event === event.bind)
+ }
+}
+
+case class AccountWebHookEvent(
+ userName: String,
+ url: String,
+ event: WebHook.Event
+ )
diff --git a/src/main/scala/gitbucket/core/model/BasicTemplate.scala b/src/main/scala/gitbucket/core/model/BasicTemplate.scala
index c3b8e1b..5608bbd 100644
--- a/src/main/scala/gitbucket/core/model/BasicTemplate.scala
+++ b/src/main/scala/gitbucket/core/model/BasicTemplate.scala
@@ -7,6 +7,10 @@
val userName = column[String]("USER_NAME")
val repositoryName = column[String]("REPOSITORY_NAME")
+ def byAccount(userName: String) = (this.userName === userName.bind)
+
+ def byAccount(userName: Rep[String]) = (this.userName === userName)
+
def byRepository(owner: String, repository: String) =
(userName === owner.bind) && (repositoryName === repository.bind)
@@ -38,6 +42,20 @@
byRepository(owner, repository) && (this.labelName === labelName.bind)
}
+ trait PriorityTemplate extends BasicTemplate { self: Table[_] =>
+ val priorityId = column[Int]("PRIORITY_ID")
+ val priorityName = column[String]("PRIORITY_NAME")
+
+ def byPriority(owner: String, repository: String, priorityId: Int) =
+ byRepository(owner, repository) && (this.priorityId === priorityId.bind)
+
+ def byPriority(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) =
+ byRepository(userName, repositoryName) && (this.priorityId === priorityId)
+
+ def byPriority(owner: String, repository: String, priorityName: String) =
+ byRepository(owner, repository) && (this.priorityName === priorityName.bind)
+ }
+
trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
val milestoneId = column[Int]("MILESTONE_ID")
diff --git a/src/main/scala/gitbucket/core/model/Issue.scala b/src/main/scala/gitbucket/core/model/Issue.scala
index fd7a5ce..7167195 100644
--- a/src/main/scala/gitbucket/core/model/Issue.scala
+++ b/src/main/scala/gitbucket/core/model/Issue.scala
@@ -13,12 +13,13 @@
def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
}
- class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
+ class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
val commentCount = column[Int]("COMMENT_COUNT")
- def * = (userName, repositoryName, issueId, commentCount)
+ val priority = column[Int]("PRIORITY")
+ def * = (userName, repositoryName, issueId, commentCount, priority)
}
- class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate {
+ class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate with PriorityTemplate {
val openedUserName = column[String]("OPENED_USER_NAME")
val assignedUserName = column[String]("ASSIGNED_USER_NAME")
val title = column[String]("TITLE")
@@ -27,7 +28,7 @@
val registeredDate = column[java.util.Date]("REGISTERED_DATE")
val updatedDate = column[java.util.Date]("UPDATED_DATE")
val pullRequest = column[Boolean]("PULL_REQUEST")
- def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
+ def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, priorityId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
}
@@ -39,6 +40,7 @@
issueId: Int,
openedUserName: String,
milestoneId: Option[Int],
+ priorityId: Option[Int],
assignedUserName: Option[String],
title: String,
content: Option[String],
diff --git a/src/main/scala/gitbucket/core/model/Priorities.scala b/src/main/scala/gitbucket/core/model/Priorities.scala
new file mode 100644
index 0000000..eb31740
--- /dev/null
+++ b/src/main/scala/gitbucket/core/model/Priorities.scala
@@ -0,0 +1,43 @@
+package gitbucket.core.model
+
+trait PriorityComponent extends TemplateComponent { self: Profile =>
+ import profile.api._
+
+ lazy val Priorities = TableQuery[Priorities]
+
+ class Priorities(tag: Tag) extends Table[Priority](tag, "PRIORITY") with PriorityTemplate {
+ override val priorityId = column[Int]("PRIORITY_ID", O AutoInc)
+ override val priorityName = column[String]("PRIORITY_NAME")
+ val description = column[String]("DESCRIPTION")
+ val ordering = column[Int]("ORDERING")
+ val isDefault = column[Boolean]("IS_DEFAULT")
+ val color = column[String]("COLOR")
+ def * = (userName, repositoryName, priorityId, priorityName, description.?, isDefault, ordering, color) <> (Priority.tupled, Priority.unapply)
+
+ def byPrimaryKey(owner: String, repository: String, priorityId: Int) = byPriority(owner, repository, priorityId)
+ def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], priorityId: Rep[Int]) = byPriority(userName, repositoryName, priorityId)
+ }
+}
+
+case class Priority (
+ userName: String,
+ repositoryName: String,
+ priorityId: Int = 0,
+ priorityName: String,
+ description: Option[String],
+ isDefault: Boolean,
+ ordering: Int = 0,
+ color: String){
+
+ val fontColor = {
+ val r = color.substring(0, 2)
+ val g = color.substring(2, 4)
+ val b = color.substring(4, 6)
+
+ if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
+ "000000"
+ } else {
+ "ffffff"
+ }
+ }
+}
diff --git a/src/main/scala/gitbucket/core/model/Profile.scala b/src/main/scala/gitbucket/core/model/Profile.scala
index 332e7ea..807456b 100644
--- a/src/main/scala/gitbucket/core/model/Profile.scala
+++ b/src/main/scala/gitbucket/core/model/Profile.scala
@@ -16,6 +16,11 @@
)
/**
+ * WebHookBase.Event Column Types
+ */
+ implicit val eventColumnType = MappedColumnType.base[WebHook.Event, String](_.name, WebHook.Event.valueOf(_))
+
+ /**
* Extends Column to add conditional condition
*/
implicit class RichColumn(c1: Rep[Boolean]){
@@ -47,12 +52,15 @@
with IssueCommentComponent
with IssueLabelComponent
with LabelComponent
+ with PriorityComponent
with MilestoneComponent
with PullRequestComponent
with RepositoryComponent
with SshKeyComponent
- with WebHookComponent
- with WebHookEventComponent
+ with RepositoryWebHookComponent
+ with RepositoryWebHookEventComponent
+ with AccountWebHookComponent
+ with AccountWebHookEventComponent
with ProtectedBranchComponent
with DeployKeyComponent
diff --git a/src/main/scala/gitbucket/core/model/RepositoryWebHook.scala b/src/main/scala/gitbucket/core/model/RepositoryWebHook.scala
new file mode 100644
index 0000000..967d067
--- /dev/null
+++ b/src/main/scala/gitbucket/core/model/RepositoryWebHook.scala
@@ -0,0 +1,27 @@
+package gitbucket.core.model
+
+trait RepositoryWebHookComponent extends TemplateComponent { self: Profile =>
+ import profile.api._
+
+ implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
+
+ lazy val RepositoryWebHooks = TableQuery[RepositoryWebHooks]
+
+ class RepositoryWebHooks(tag: Tag) extends Table[RepositoryWebHook](tag, "WEB_HOOK") with BasicTemplate {
+ val url = column[String]("URL")
+ val token = column[Option[String]]("TOKEN")
+ val ctype = column[WebHookContentType]("CTYPE")
+ def * = (userName, repositoryName, url, ctype, token) <> ((RepositoryWebHook.apply _).tupled, RepositoryWebHook.unapply)
+
+ def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+ }
+}
+
+
+case class RepositoryWebHook(
+ userName: String,
+ repositoryName: String,
+ url: String,
+ ctype: WebHookContentType,
+ token: Option[String]
+) extends WebHook
diff --git a/src/main/scala/gitbucket/core/model/RepositoryWebHookEvent.scala b/src/main/scala/gitbucket/core/model/RepositoryWebHookEvent.scala
new file mode 100644
index 0000000..83cbea5
--- /dev/null
+++ b/src/main/scala/gitbucket/core/model/RepositoryWebHookEvent.scala
@@ -0,0 +1,28 @@
+package gitbucket.core.model
+
+trait RepositoryWebHookEventComponent extends TemplateComponent { self: Profile =>
+ import profile.api._
+ import gitbucket.core.model.Profile.RepositoryWebHooks
+
+ lazy val RepositoryWebHookEvents = TableQuery[RepositoryWebHookEvents]
+
+ class RepositoryWebHookEvents(tag: Tag) extends Table[RepositoryWebHookEvent](tag, "WEB_HOOK_EVENT") with BasicTemplate {
+ val url = column[String]("URL")
+ val event = column[WebHook.Event]("EVENT")
+ def * = (userName, repositoryName, url, event) <> ((RepositoryWebHookEvent.apply _).tupled, RepositoryWebHookEvent.unapply)
+
+ def byRepositoryWebHook(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+ def byRepositoryWebHook(owner: Rep[String], repository: Rep[String], url: Rep[String]) =
+ byRepository(userName, repositoryName) && (this.url === url)
+ def byRepositoryWebHook(webhook: RepositoryWebHooks) =
+ byRepository(webhook.userName, webhook.repositoryName) && (this.url === webhook.url)
+ def byPrimaryKey(owner: String, repository: String, url: String, event: WebHook.Event) = byRepositoryWebHook(owner, repository, url) && (this.event === event.bind)
+ }
+}
+
+case class RepositoryWebHookEvent(
+ userName: String,
+ repositoryName: String,
+ url: String,
+ event: WebHook.Event
+)
diff --git a/src/main/scala/gitbucket/core/model/WebHook.scala b/src/main/scala/gitbucket/core/model/WebHook.scala
index 48de21b..3643dfb 100644
--- a/src/main/scala/gitbucket/core/model/WebHook.scala
+++ b/src/main/scala/gitbucket/core/model/WebHook.scala
@@ -1,22 +1,5 @@
package gitbucket.core.model
-trait WebHookComponent extends TemplateComponent { self: Profile =>
- import profile.api._
-
- implicit val whContentTypeColumnType = MappedColumnType.base[WebHookContentType, String](whct => whct.code , code => WebHookContentType.valueOf(code))
-
- lazy val WebHooks = TableQuery[WebHooks]
-
- class WebHooks(tag: Tag) extends Table[WebHook](tag, "WEB_HOOK") with BasicTemplate {
- val url = column[String]("URL")
- val token = column[Option[String]]("TOKEN")
- val ctype = column[WebHookContentType]("CTYPE")
- def * = (userName, repositoryName, url, ctype, token) <> ((WebHook.apply _).tupled, WebHook.unapply)
-
- def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
- }
-}
-
abstract sealed case class WebHookContentType(code: String, ctype: String)
object WebHookContentType {
@@ -33,13 +16,11 @@
def valueOpt(code: String): Option[WebHookContentType] = map.get(code)
}
-case class WebHook(
- userName: String,
- repositoryName: String,
- url: String,
- ctype: WebHookContentType,
- token: Option[String]
-)
+trait WebHook{
+ val url: String
+ val ctype: WebHookContentType
+ val token: Option[String]
+}
object WebHook {
abstract sealed class Event(val name: String)
@@ -86,6 +67,7 @@
TeamAdd,
Watch
)
+
private val map: Map[String,Event] = values.map(e => e.name -> e).toMap
def valueOf(name: String): Event = map(name)
def valueOpt(name: String): Option[Event] = map.get(name)
diff --git a/src/main/scala/gitbucket/core/model/WebHookEvent.scala b/src/main/scala/gitbucket/core/model/WebHookEvent.scala
deleted file mode 100644
index d9f5a55..0000000
--- a/src/main/scala/gitbucket/core/model/WebHookEvent.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package gitbucket.core.model
-
-trait WebHookEventComponent extends TemplateComponent { self: Profile =>
- import profile.api._
- import gitbucket.core.model.Profile.WebHooks
-
- lazy val WebHookEvents = TableQuery[WebHookEvents]
-
- implicit val typedType = MappedColumnType.base[WebHook.Event, String](_.name, WebHook.Event.valueOf(_))
-
- class WebHookEvents(tag: Tag) extends Table[WebHookEvent](tag, "WEB_HOOK_EVENT") with BasicTemplate {
- val url = column[String]("URL")
- val event = column[WebHook.Event]("EVENT")
- def * = (userName, repositoryName, url, event) <> ((WebHookEvent.apply _).tupled, WebHookEvent.unapply)
-
- def byWebHook(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
- def byWebHook(owner: Rep[String], repository: Rep[String], url: Rep[String]) =
- byRepository(userName, repositoryName) && (this.url === url)
- def byWebHook(webhook: WebHooks) =
- byRepository(webhook.userName, webhook.repositoryName) && (this.url === webhook.url)
- def byPrimaryKey(owner: String, repository: String, url: String, event: WebHook.Event) = byWebHook(owner, repository, url) && (this.event === event.bind)
- }
-}
-
-case class WebHookEvent(
- userName: String,
- repositoryName: String,
- url: String,
- event: WebHook.Event
-)
diff --git a/src/main/scala/gitbucket/core/plugin/AccountHook.scala b/src/main/scala/gitbucket/core/plugin/AccountHook.scala
new file mode 100644
index 0000000..b6db885
--- /dev/null
+++ b/src/main/scala/gitbucket/core/plugin/AccountHook.scala
@@ -0,0 +1,10 @@
+package gitbucket.core.plugin
+
+import gitbucket.core.model.Profile._
+import profile.api._
+
+trait AccountHook {
+
+ def deleted(userName: String)(implicit session: Session): Unit = ()
+
+}
diff --git a/src/main/scala/gitbucket/core/plugin/IssueHook.scala b/src/main/scala/gitbucket/core/plugin/IssueHook.scala
new file mode 100644
index 0000000..8bed047
--- /dev/null
+++ b/src/main/scala/gitbucket/core/plugin/IssueHook.scala
@@ -0,0 +1,20 @@
+package gitbucket.core.plugin
+
+import gitbucket.core.controller.Context
+import gitbucket.core.model.Issue
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+
+trait IssueHook {
+
+ def created(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+ def addedComment(commentId: Int, content: String, issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+ def closed(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+ def reopened(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+
+}
+
+trait PullRequestHook extends IssueHook {
+
+ def merged(issue: Issue, repository: RepositoryInfo)(implicit context: Context): Unit = ()
+
+}
diff --git a/src/main/scala/gitbucket/core/plugin/Plugin.scala b/src/main/scala/gitbucket/core/plugin/Plugin.scala
index c751ad8..c2a5ecb 100644
--- a/src/main/scala/gitbucket/core/plugin/Plugin.scala
+++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala
@@ -1,12 +1,14 @@
package gitbucket.core.plugin
import javax.servlet.ServletContext
+
import gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.model.Account
+import gitbucket.core.model.{Account, Issue}
import gitbucket.core.service.RepositoryService.RepositoryInfo
import gitbucket.core.service.SystemSettingsService.SystemSettings
import gitbucket.core.util.SyntaxSugars._
import io.github.gitbucket.solidbase.model.Version
+import play.twirl.api.Html
/**
* Trait for define plugin interface.
@@ -70,6 +72,16 @@
def repositoryRoutings(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[GitRepositoryRouting] = Nil
/**
+ * Override to add account hooks.
+ */
+ val accountHooks: Seq[AccountHook] = Nil
+
+ /**
+ * Override to add account hooks.
+ */
+ def accountHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[AccountHook] = Nil
+
+ /**
* Override to add receive hooks.
*/
val receiveHooks: Seq[ReceiveHook] = Nil
@@ -90,6 +102,26 @@
def repositoryHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[RepositoryHook] = Nil
/**
+ * Override to add issue hooks.
+ */
+ val issueHooks: Seq[IssueHook] = Nil
+
+ /**
+ * Override to add issue hooks.
+ */
+ def issueHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[IssueHook] = Nil
+
+ /**
+ * Override to add pull request hooks.
+ */
+ val pullRequestHooks: Seq[PullRequestHook] = Nil
+
+ /**
+ * Override to add pull request hooks.
+ */
+ def pullRequestHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[PullRequestHook] = Nil
+
+ /**
* Override to add global menus.
*/
val globalMenus: Seq[(Context) => Option[Link]] = Nil
@@ -160,6 +192,16 @@
def dashboardTabs(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Context) => Option[Link]] = Nil
/**
+ * Override to add issue sidebars.
+ */
+ val issueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = Nil
+
+ /**
+ * Override to add issue sidebars.
+ */
+ def issueSidebars(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = Nil
+
+ /**
* Override to add assets mappings.
*/
val assetsMappings: Seq[(String, String)] = Nil
@@ -209,12 +251,21 @@
(repositoryRoutings ++ repositoryRoutings(registry, context, settings)).foreach { routing =>
registry.addRepositoryRouting(routing)
}
+ (accountHooks ++ accountHooks(registry, context, settings)).foreach { accountHook =>
+ registry.addAccountHook(accountHook)
+ }
(receiveHooks ++ receiveHooks(registry, context, settings)).foreach { receiveHook =>
registry.addReceiveHook(receiveHook)
}
(repositoryHooks ++ repositoryHooks(registry, context, settings)).foreach { repositoryHook =>
registry.addRepositoryHook(repositoryHook)
}
+ (issueHooks ++ issueHooks(registry, context, settings)).foreach { issueHook =>
+ registry.addIssueHook(issueHook)
+ }
+ (pullRequestHooks ++ pullRequestHooks(registry, context, settings)).foreach { pullRequestHook =>
+ registry.addPullRequestHook(pullRequestHook)
+ }
(globalMenus ++ globalMenus(registry, context, settings)).foreach { globalMenu =>
registry.addGlobalMenu(globalMenu)
}
@@ -236,6 +287,9 @@
(dashboardTabs ++ dashboardTabs(registry, context, settings)).foreach { dashboardTab =>
registry.addDashboardTab(dashboardTab)
}
+ (issueSidebars ++ issueSidebars(registry, context, settings)).foreach { issueSidebar =>
+ registry.addIssueSidebar(issueSidebar)
+ }
(assetsMappings ++ assetsMappings(registry, context, settings)).foreach { assetMapping =>
registry.addAssetsMapping((assetMapping._1, assetMapping._2, getClass.getClassLoader))
}
diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
index 7a84d70..74d2561 100644
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
@@ -8,7 +8,7 @@
import javax.servlet.ServletContext
import gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.model.Account
+import gitbucket.core.model.{Account, Issue}
import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook
import gitbucket.core.service.RepositoryService.RepositoryInfo
import gitbucket.core.service.SystemSettingsService
@@ -21,9 +21,11 @@
import io.github.gitbucket.solidbase.model.Module
import org.apache.commons.io.FileUtils
import org.slf4j.LoggerFactory
+import play.twirl.api.Html
import scala.collection.mutable
import scala.collection.mutable.ListBuffer
+import com.github.zafarkhaja.semver.Version
class PluginRegistry {
@@ -36,10 +38,17 @@
"md" -> MarkdownRenderer, "markdown" -> MarkdownRenderer
)
private val repositoryRoutings = new ListBuffer[GitRepositoryRouting]
+ private val accountHooks = new ListBuffer[AccountHook]
private val receiveHooks = new ListBuffer[ReceiveHook]
receiveHooks += new ProtectedBranchReceiveHook()
private val repositoryHooks = new ListBuffer[RepositoryHook]
+ private val issueHooks = new ListBuffer[IssueHook]
+ issueHooks += new gitbucket.core.util.Notifier.IssueHook()
+
+ private val pullRequestHooks = new ListBuffer[PullRequestHook]
+ pullRequestHooks += new gitbucket.core.util.Notifier.PullRequestHook()
+
private val globalMenus = new ListBuffer[(Context) => Option[Link]]
private val repositoryMenus = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
private val repositorySettingTabs = new ListBuffer[(RepositoryInfo, Context) => Option[Link]]
@@ -47,6 +56,7 @@
private val systemSettingMenus = new ListBuffer[(Context) => Option[Link]]
private val accountSettingMenus = new ListBuffer[(Context) => Option[Link]]
private val dashboardTabs = new ListBuffer[(Context) => Option[Link]]
+ private val issueSidebars = new ListBuffer[(Issue, RepositoryInfo, Context) => Option[Html]]
private val assetsMappings = new ListBuffer[(String, String, ClassLoader)]
private val textDecorators = new ListBuffer[TextDecorator]
@@ -103,6 +113,10 @@
}
}
+ def addAccountHook(accountHook: AccountHook): Unit = accountHooks += accountHook
+
+ def getAccountHooks: Seq[AccountHook] = accountHooks.toSeq
+
def addReceiveHook(commitHook: ReceiveHook): Unit = receiveHooks += commitHook
def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.toSeq
@@ -111,6 +125,14 @@
def getRepositoryHooks: Seq[RepositoryHook] = repositoryHooks.toSeq
+ def addIssueHook(issueHook: IssueHook): Unit = issueHooks += issueHook
+
+ def getIssueHooks: Seq[IssueHook] = issueHooks.toSeq
+
+ def addPullRequestHook(pullRequestHook: PullRequestHook): Unit = pullRequestHooks += pullRequestHook
+
+ def getPullRequestHooks: Seq[PullRequestHook] = pullRequestHooks.toSeq
+
def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus += globalMenu
def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.toSeq
@@ -139,6 +161,10 @@
def getDashboardTabs: Seq[(Context) => Option[Link]] = dashboardTabs.toSeq
+ def addIssueSidebar(issueSidebar: (Issue, RepositoryInfo, Context) => Option[Html]): Unit = issueSidebars += issueSidebar
+
+ def getIssueSidebars: Seq[(Issue, RepositoryInfo, Context) => Option[Html]] = issueSidebars.toSeq
+
def addAssetsMapping(assetsMapping: (String, String, ClassLoader)): Unit = assetsMappings += assetsMapping
def getAssetsMappings: Seq[(String, String, ClassLoader)] = assetsMappings.toSeq
@@ -233,14 +259,17 @@
if(pluginDir.exists && pluginDir.isDirectory){
val files = pluginDir.listFiles(new FilenameFilter {
override def accept(dir: File, name: String): Boolean = name.endsWith(".jar")
- }).sortBy(_.lastModified() * -1)
-
- files.foreach { pluginJar =>
- // Copy the plugin jar file to GITBUCKET_HOME/plugins/.installed
- val installedJar = new File(installedDir, pluginJar.getName)
- copyFile(pluginJar, installedJar)
-
- val classLoader = new URLClassLoader(Array(installedJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
+ }).map { file =>
+ val Array(name, version) = file.getName.split("_2.12-")
+ (name, Version.valueOf(version.replaceFirst("\\.jar$", "")), file)
+ }.groupBy { case (name, _, _) =>
+ name
+ }.map { case (name, versions) =>
+ // Adopt the latest version
+ versions.sortBy { case (name, version, file) => version }.reverse.head._3
+ }.toSeq.sortBy(_.getName).foreach { pluginJar =>
+ logger.info(s"Initialize ${pluginJar.getName}")
+ val classLoader = new URLClassLoader(Array(pluginJar.toURI.toURL), Thread.currentThread.getContextClassLoader)
try {
val plugin = classLoader.loadClass("Plugin").getDeclaredConstructor().newInstance().asInstanceOf[Plugin]
val pluginId = plugin.pluginId
@@ -268,10 +297,9 @@
pluginName = plugin.pluginName,
pluginVersion = plugin.versions.last.getVersion,
description = plugin.description,
- pluginClass = plugin,
- pluginJar = pluginJar,
- classLoader = classLoader
- ), true)
+ pluginClass = plugin
+ ))
+
} catch {
case e: Throwable => {
logger.error(s"Error during plugin initialization: ${pluginJar.getName}", e)
diff --git a/src/main/scala/gitbucket/core/service/ActivityService.scala b/src/main/scala/gitbucket/core/service/ActivityService.scala
index 433909d..f75a15c 100644
--- a/src/main/scala/gitbucket/core/service/ActivityService.scala
+++ b/src/main/scala/gitbucket/core/service/ActivityService.scala
@@ -59,7 +59,7 @@
Activities insert Activity(userName, repositoryName, activityUserName,
"open_issue",
s"[user:${activityUserName}] opened issue [issue:${userName}/${repositoryName}#${issueId}]",
- Some(title),
+ Some(title),
currentDate)
def recordCloseIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
@@ -132,10 +132,10 @@
Activities insert Activity(userName, repositoryName, activityUserName,
"push",
s"[user:${activityUserName}] pushed to [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
- Some(commits.map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
+ Some(commits.take(5).map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
currentDate)
- def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String,
+ def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String,
tagName: String, commits: List[JGitUtil.CommitInfo])(implicit s: Session): Unit =
Activities insert Activity(userName, repositoryName, activityUserName,
"create_tag",
@@ -167,7 +167,7 @@
None,
currentDate)
- def recordForkActivity(userName: String, repositoryName: String, activityUserName: String, forkedUserName: String)(implicit s: Session): Unit =
+ def recordForkActivity(userName: String, repositoryName: String, activityUserName: String, forkedUserName: String)(implicit s: Session): Unit =
Activities insert Activity(userName, repositoryName, activityUserName,
"fork",
s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${forkedUserName}/${repositoryName}]",
diff --git a/src/main/scala/gitbucket/core/service/HandleCommentService.scala b/src/main/scala/gitbucket/core/service/HandleCommentService.scala
index aaa4cf7..f7ce6ff 100644
--- a/src/main/scala/gitbucket/core/service/HandleCommentService.scala
+++ b/src/main/scala/gitbucket/core/service/HandleCommentService.scala
@@ -2,11 +2,10 @@
import gitbucket.core.controller.Context
import gitbucket.core.model.Issue
-import gitbucket.core.model.Profile._
import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.plugin.PluginRegistry
import gitbucket.core.util.SyntaxSugars._
import gitbucket.core.util.Implicits._
-import gitbucket.core.util.Notifier
trait HandleCommentService {
self: RepositoryService with IssuesService with ActivityService
@@ -21,7 +20,7 @@
defining(repository.owner, repository.name){ case (owner, name) =>
val userName = loginAccount.userName
- val (action, recordActivity) = actionOpt
+ val (action, actionActivity) = actionOpt
.collect {
case "close" if(!issue.closed) => true ->
(Some("close") -> Some(if(issue.isPullRequest) recordClosePullRequestActivity _ else recordCloseIssueActivity _))
@@ -36,54 +35,55 @@
val commentId = (content, action) match {
case (None, None) => None
- case (None, Some(action)) => Some(createComment(owner, name, userName, issue.issueId, action.capitalize, action))
- case (Some(content), _) => Some(createComment(owner, name, userName, issue.issueId, content, action.map(_+ "_comment").getOrElse("comment")))
+ case (None, Some(action)) =>
+ Some(createComment(owner, name, userName, issue.issueId, action.capitalize, action))
+ case (Some(content), _) =>
+ val id = Some(createComment(owner, name, userName, issue.issueId, content, action.map(_+ "_comment").getOrElse("comment")))
+
+ // record comment activity
+ if(issue.isPullRequest) recordCommentPullRequestActivity(owner, name, userName, issue.issueId, content)
+ else recordCommentIssueActivity(owner, name, userName, issue.issueId, content)
+
+ // extract references and create refer comment
+ createReferComment(owner, name, issue, content, loginAccount)
+
+ id
}
- // record comment activity if comment is entered
- content foreach {
- (if(issue.isPullRequest) recordCommentPullRequestActivity _ else recordCommentIssueActivity _)
- (owner, name, userName, issue.issueId, _)
- }
- recordActivity foreach ( _ (owner, name, userName, issue.issueId, issue.title) )
-
- // extract references and create refer comment
- content.map { content =>
- createReferComment(owner, name, issue, content, loginAccount)
- }
+ actionActivity foreach ( _ (owner, name, userName, issue.issueId, issue.title) )
// call web hooks
action match {
- case None => commentId.map { commentIdSome => callIssueCommentWebHook(repository, issue, commentIdSome, loginAccount) }
- case Some(act) => {
+ case None => commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount))
+ case Some(act) =>
val webHookAction = act match {
- case "open" => "opened"
- case "reopen" => "reopened"
case "close" => "closed"
- case _ => act
+ case "reopen" => "reopened"
}
- if (issue.isPullRequest) {
+ if(issue.isPullRequest)
callPullRequestWebHook(webHookAction, repository, issue.issueId, context.baseUrl, loginAccount)
- } else {
+ else
callIssuesWebHook(webHookAction, repository, issue, context.baseUrl, loginAccount)
- }
- }
}
- // notifications
- Notifier() match {
- case f =>
- content foreach {
- f.toNotify(repository, issue, _){
- Notifier.msgComment(s"${context.baseUrl}/${owner}/${name}/${
- if(issue.isPullRequest) "pull" else "issues"}/${issue.issueId}#comment-${commentId.get}")
- }
- }
- action foreach {
- f.toNotify(repository, issue, _){
- Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/issues/${issue.issueId}")
- }
- }
+ // call hooks
+ content foreach { x =>
+ if(issue.isPullRequest)
+ PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
+ else
+ PluginRegistry().getIssueHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
+ }
+ action foreach {
+ case "close" =>
+ if(issue.isPullRequest)
+ PluginRegistry().getPullRequestHooks.foreach(_.closed(issue, repository))
+ else
+ PluginRegistry().getIssueHooks.foreach(_.closed(issue, repository))
+ case "reopen" =>
+ if(issue.isPullRequest)
+ PluginRegistry().getPullRequestHooks.foreach(_.reopened(issue, repository))
+ else
+ PluginRegistry().getIssueHooks.foreach(_.reopened(issue, repository))
}
commentId.map( issue -> _ )
diff --git a/src/main/scala/gitbucket/core/service/IssueCreationService.scala b/src/main/scala/gitbucket/core/service/IssueCreationService.scala
index a18dad3..ad67266 100644
--- a/src/main/scala/gitbucket/core/service/IssueCreationService.scala
+++ b/src/main/scala/gitbucket/core/service/IssueCreationService.scala
@@ -3,17 +3,16 @@
import gitbucket.core.controller.Context
import gitbucket.core.model.{Account, Issue}
import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.plugin.PluginRegistry
import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.core.util.Notifier
import gitbucket.core.util.Implicits._
-// TODO: Merged with IssuesService?
trait IssueCreationService {
self: RepositoryService with WebHookIssueCommentService with LabelsService with IssuesService with ActivityService =>
def createIssue(repository: RepositoryInfo, title:String, body:Option[String],
- assignee: Option[String], milestoneId: Option[Int], labelNames: Seq[String],
+ assignee: Option[String], milestoneId: Option[Int], priorityId: Option[Int], labelNames: Seq[String],
loginAccount: Account)(implicit context: Context, s: Session) : Issue = {
val owner = repository.owner
@@ -24,7 +23,8 @@
// insert issue
val issueId = insertIssue(owner, name, userName, title, body,
if (manageable) assignee else None,
- if (manageable) milestoneId else None)
+ if (manageable) milestoneId else None,
+ if (manageable) priorityId else None)
val issue: Issue = getIssue(owner, name, issueId.toString).get
// insert labels
@@ -46,10 +46,9 @@
// call web hooks
callIssuesWebHook("opened", repository, issue, context.baseUrl, loginAccount)
- // notifications
- Notifier().toNotify(repository, issue, body.getOrElse("")) {
- Notifier.msgIssue(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
- }
+ // call hooks
+ PluginRegistry().getIssueHooks.foreach(_.created(issue, repository))
+
issue
}
diff --git a/src/main/scala/gitbucket/core/service/IssuesService.scala b/src/main/scala/gitbucket/core/service/IssuesService.scala
index 4a9b12c..a782dde 100644
--- a/src/main/scala/gitbucket/core/service/IssuesService.scala
+++ b/src/main/scala/gitbucket/core/service/IssuesService.scala
@@ -97,6 +97,30 @@
.list.toMap
}
+ /**
+ * Returns the Map which contains issue count for each priority.
+ *
+ * @param owner the repository owner
+ * @param repository the repository name
+ * @param condition the search condition
+ * @return the Map which contains issue count for each priority (key is priority name, value is issue count)
+ */
+ def countIssueGroupByPriorities(owner: String, repository: String, condition: IssueSearchCondition,
+ filterUser: Map[String, String])(implicit s: Session): Map[String, Int] = {
+
+ searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), false)
+ .join(Priorities).on { case t1 ~ t2 =>
+ t1.byPriority(t2.userName, t2.repositoryName, t2.priorityId)
+ }
+ .groupBy { case t1 ~ t2 =>
+ t2.priorityName
+ }
+ .map { case priorityName ~ t =>
+ priorityName -> t.length
+ }
+ .list.toMap
+ }
+
def getCommitStatues(userName: String, repositoryName: String, issueId: Int)(implicit s: Session): Option[CommitStatusInfo] = {
val status = PullRequests
.filter { pr =>
@@ -136,21 +160,23 @@
(implicit s: Session): List[IssueInfo] = {
// get issues and comment count and labels
val result = searchIssueQueryBase(condition, pullRequest, offset, limit, repos)
- .joinLeft (IssueLabels) .on { case t1 ~ t2 ~ i ~ t3 => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
- .joinLeft (Labels) .on { case t1 ~ t2 ~ i ~ t3 ~ t4 => t3.map(_.byLabel(t4.userName, t4.repositoryName, t4.labelId)) }
- .joinLeft (Milestones) .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
- .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 => i asc }
- .map { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 =>
- (t1, t2.commentCount, t4.map(_.labelId), t4.map(_.labelName), t4.map(_.color), t5.map(_.title))
+ .joinLeft (IssueLabels) .on { case t1 ~ t2 ~ i ~ t3 => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
+ .joinLeft (Labels) .on { case t1 ~ t2 ~ i ~ t3 ~ t4 => t3.map(_.byLabel(t4.userName, t4.repositoryName, t4.labelId)) }
+ .joinLeft (Milestones) .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
+ .joinLeft (Priorities) .on { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => t1.byPriority(t6.userName, t6.repositoryName, t6.priorityId) }
+ .sortBy { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 => i asc }
+ .map { case t1 ~ t2 ~ i ~ t3 ~ t4 ~ t5 ~ t6 =>
+ (t1, t2.commentCount, t4.map(_.labelId), t4.map(_.labelName), t4.map(_.color), t5.map(_.title), t6.map(_.priorityName))
}
.list
.splitWith { (c1, c2) => c1._1.userName == c2._1.userName && c1._1.repositoryName == c2._1.repositoryName && c1._1.issueId == c2._1.issueId }
result.map { issues => issues.head match {
- case (issue, commentCount, _, _, _, milestone) =>
+ case (issue, commentCount, _, _, _, milestone, priority) =>
IssueInfo(issue,
issues.flatMap { t => t._3.map (Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get))} toList,
milestone,
+ priority,
commentCount,
getCommitStatues(issue.userName, issue.repositoryName, issue.issueId))
}} toList
@@ -204,6 +230,10 @@
case "asc" => t1.updatedDate asc
case "desc" => t1.updatedDate desc
}
+ case "priority" => condition.direction match {
+ case "asc" => t2.priority asc
+ case "desc" => t2.priority desc
+ }
}
}
.drop(offset).take(limit).zipWithIndex
@@ -219,6 +249,7 @@
.foldLeft[Rep[Boolean]](false) ( _ || _ ) &&
(t1.closed === (condition.state == "closed").bind) &&
(t1.milestoneId.? isEmpty, condition.milestone == Some(None)) &&
+ (t1.priorityId.? isEmpty, condition.priority == Some(None)) &&
(t1.assignedUserName.? isEmpty, condition.assigned == Some(None)) &&
(t1.openedUserName === condition.author.get.bind, condition.author.isDefined) &&
(t1.pullRequest === pullRequest.bind) &&
@@ -227,6 +258,11 @@
(t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.milestoneId)) &&
(t2.title === condition.milestone.get.get.bind)
} exists, condition.milestone.flatten.isDefined) &&
+ // Priority filter
+ (Priorities filter { t2 =>
+ (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.priorityId)) &&
+ (t2.priorityName === condition.priority.get.get.bind)
+ } exists, condition.priority.flatten.isDefined) &&
// Assignee filter
(t1.assignedUserName === condition.assigned.get.get.bind, condition.assigned.flatten.isDefined) &&
// Label filter
@@ -253,7 +289,7 @@
}
def insertIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
- assignedUserName: Option[String], milestoneId: Option[Int],
+ assignedUserName: Option[String], milestoneId: Option[Int], priorityId: Option[Int],
isPullRequest: Boolean = false)(implicit s: Session): Int = {
// next id number
sql"SELECT ISSUE_ID + 1 FROM ISSUE_ID WHERE USER_NAME = $owner AND REPOSITORY_NAME = $repository FOR UPDATE".as[Int]
@@ -264,6 +300,7 @@
id,
loginUser,
milestoneId,
+ priorityId,
assignedUserName,
title,
content,
@@ -316,6 +353,10 @@
Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
}
+ def updatePriorityId(owner: String, repository: String, issueId: Int, priorityId: Option[Int])(implicit s: Session): Int = {
+ Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.priorityId?).update (priorityId)
+ }
+
def updateComment(commentId: Int, content: String)(implicit s: Session): Int = {
IssueComments.filter (_.byPrimaryKey(commentId)).map(t => (t.content, t.updatedDate)).update(content, currentDate)
}
@@ -430,6 +471,7 @@
case class IssueSearchCondition(
labels: Set[String] = Set.empty,
milestone: Option[Option[String]] = None,
+ priority: Option[Option[String]] = None,
author: Option[String] = None,
assigned: Option[Option[String]] = None,
mentioned: Option[String] = None,
@@ -459,6 +501,10 @@
case Some(x) => s"milestone:${x}"
case None => "no:milestone"
}},
+ priority.map { _ match {
+ case Some(x) => s"priority:${x}"
+ case None => "no:priority"
+ }},
(sort, direction) match {
case ("created" , "desc") => None
case ("created" , "asc" ) => Some("sort:created-asc")
@@ -466,6 +512,8 @@
case ("comments", "asc" ) => Some("sort:comments-asc")
case ("updated" , "desc") => Some("sort:updated-desc")
case ("updated" , "asc" ) => Some("sort:updated-asc")
+ case ("priority", "desc") => Some("sort:priority-desc")
+ case ("priority", "asc" ) => Some("sort:priority-asc")
case x => throw new MatchError(x)
},
visibility.map(visibility => s"visibility:${visibility}")
@@ -480,6 +528,10 @@
case Some(x) => "milestone=" + urlEncode(x)
case None => "milestone=none"
},
+ priority.map {
+ case Some(x) => "priority=" + urlEncode(x)
+ case None => "priority=none"
+ },
author .map(x => "author=" + urlEncode(x)),
assigned.map {
case Some(x) => "assigned=" + urlEncode(x)
@@ -512,6 +564,10 @@
case "none" => None
case x => Some(x)
},
+ param(request, "priority").map {
+ case "none" => None
+ case x => Some(x)
+ },
param(request, "author"),
param(request, "assigned").map {
case "none" => None
@@ -519,7 +575,7 @@
},
param(request, "mentioned"),
param(request, "state", Seq("open", "closed")).getOrElse("open"),
- param(request, "sort", Seq("created", "comments", "updated")).getOrElse("created"),
+ param(request, "sort", Seq("created", "comments", "updated", "priority")).getOrElse("created"),
param(request, "direction", Seq("asc", "desc")).getOrElse("desc"),
param(request, "visibility"),
param(request, "groups").map(_.split(",").toSet).getOrElse(Set.empty)
@@ -535,6 +591,6 @@
case class CommitStatusInfo(count: Int, successCount: Int, context: Option[String], state: Option[CommitState], targetUrl: Option[String], description: Option[String])
- case class IssueInfo(issue: Issue, labels: List[Label], milestone: Option[String], commentCount: Int, status:Option[CommitStatusInfo])
+ case class IssueInfo(issue: Issue, labels: List[Label], milestone: Option[String], priority: Option[String], commentCount: Int, status:Option[CommitStatusInfo])
}
diff --git a/src/main/scala/gitbucket/core/service/PrioritiesService.scala b/src/main/scala/gitbucket/core/service/PrioritiesService.scala
new file mode 100644
index 0000000..cafff4b
--- /dev/null
+++ b/src/main/scala/gitbucket/core/service/PrioritiesService.scala
@@ -0,0 +1,84 @@
+package gitbucket.core.service
+
+import gitbucket.core.model.Priority
+import gitbucket.core.model.Profile._
+import gitbucket.core.model.Profile.profile.blockingApi._
+import gitbucket.core.util.StringUtil
+
+trait PrioritiesService {
+
+ def getPriorities(owner: String, repository: String)(implicit s: Session): List[Priority] =
+ Priorities.filter(_.byRepository(owner, repository)).sortBy(_.ordering asc).list
+
+ def getPriority(owner: String, repository: String, priorityId: Int)(implicit s: Session): Option[Priority] =
+ Priorities.filter(_.byPrimaryKey(owner, repository, priorityId)).firstOption
+
+ def getPriority(owner: String, repository: String, priorityName: String)(implicit s: Session): Option[Priority] =
+ Priorities.filter(_.byPriority(owner, repository, priorityName)).firstOption
+
+ def createPriority(owner: String, repository: String, priorityName: String, description: Option[String], color: String)(implicit s: Session): Int = {
+ val ordering = Priorities.filter(_.byRepository(owner, repository))
+ .list
+ .map(p => p.ordering)
+ .reduceOption(_ max _)
+ .map(m => m + 1)
+ .getOrElse(0)
+
+ Priorities returning Priorities.map(_.priorityId) insert Priority(
+ userName = owner,
+ repositoryName = repository,
+ priorityName = priorityName,
+ description = description,
+ isDefault = false,
+ ordering = ordering,
+ color = color
+ )
+ }
+
+ def updatePriority(owner: String, repository: String, priorityId: Int, priorityName: String, description: Option[String], color: String)
+ (implicit s: Session): Unit =
+ Priorities.filter(_.byPrimaryKey(owner, repository, priorityId))
+ .map(t => (t.priorityName, t.description.?, t.color))
+ .update(priorityName, description, color)
+
+ def reorderPriorities(owner: String, repository: String, order: Map[Int, Int])
+ (implicit s: Session): Unit = {
+
+ Priorities.filter(_.byRepository(owner, repository))
+ .list
+ .foreach(p => Priorities
+ .filter(_.byPrimaryKey(owner, repository, p.priorityId))
+ .map(_.ordering)
+ .update(order.get(p.priorityId).get))
+ }
+
+ def deletePriority(owner: String, repository: String, priorityId: Int)(implicit s: Session): Unit = {
+ Issues.filter(_.byRepository(owner, repository))
+ .filter(_.priorityId === priorityId)
+ .map(_.priorityId?)
+ .update(None)
+
+ Priorities.filter(_.byPrimaryKey(owner, repository, priorityId)).delete
+ }
+
+ def getDefaultPriority(owner: String, repository: String)(implicit s: Session): Option[Priority] = {
+ Priorities
+ .filter(_.byRepository(owner, repository))
+ .filter(_.isDefault)
+ .list
+ .headOption
+ }
+
+ def setDefaultPriority(owner: String, repository: String, priorityId: Option[Int])(implicit s: Session): Unit = {
+ Priorities
+ .filter(_.byRepository(owner, repository))
+ .filter(_.isDefault)
+ .map(_.isDefault)
+ .update(false)
+
+ priorityId.foreach(id => Priorities
+ .filter(_.byPrimaryKey(owner, repository, id))
+ .map(_.isDefault)
+ .update(true))
+ }
+}
diff --git a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
index 7381bbc..2aa4196 100644
--- a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
@@ -10,7 +10,7 @@
import org.eclipse.jgit.lib.{FileMode, Constants}
trait RepositoryCreationService {
- self: AccountService with RepositoryService with LabelsService with WikiService with ActivityService =>
+ self: AccountService with RepositoryService with LabelsService with WikiService with ActivityService with PrioritiesService =>
def createRepository(loginAccount: Account, owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
(implicit s: Session) {
@@ -30,6 +30,9 @@
// Insert default labels
insertDefaultLabels(owner, name)
+ // Insert default priorities
+ insertDefaultPriorities(owner, name)
+
// Create the actual repository
val gitdir = getRepositoryDir(owner, name)
JGitUtil.initRepository(gitdir)
@@ -74,5 +77,13 @@
createLabel(userName, repositoryName, "wontfix", "ffffff")
}
+ def insertDefaultPriorities(userName: String, repositoryName: String)(implicit s: Session): Unit = {
+ createPriority(userName, repositoryName, "highest", Some("All defects at this priority must be fixed before any public product is delivered."), "fc2929")
+ createPriority(userName, repositoryName, "very high", Some("Issues must be addressed before a final product is delivered."), "fc5629")
+ createPriority(userName, repositoryName, "high", Some("Issues should be addressed before a final product is delivered. If the issue cannot be resolved before delivery, it should be prioritized for the next release."), "fc9629")
+ createPriority(userName, repositoryName, "important", Some("Issues can be shipped with a final product, but should be reviewed before the next release."), "fccd29")
+ createPriority(userName, repositoryName, "default", Some("Default."), "acacac")
+ setDefaultPriority(userName, repositoryName, getPriority(userName, repositoryName, "default").map(_.priorityId))
+ }
}
diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala
index 3580833..e912e3f 100644
--- a/src/main/scala/gitbucket/core/service/RepositoryService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala
@@ -59,13 +59,14 @@
(Repositories filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
- val webHooks = WebHooks .filter(_.byRepository(oldUserName, oldRepositoryName)).list
- val webHookEvents = WebHookEvents .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+ val webHooks = RepositoryWebHooks .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+ val webHookEvents = RepositoryWebHookEvents.filter(_.byRepository(oldUserName, oldRepositoryName)).list
val milestones = Milestones .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val issueId = IssueId .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val issues = Issues .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val pullRequests = PullRequests .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val labels = Labels .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+ val priorities = Priorities .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val issueComments = IssueComments .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val issueLabels = IssueLabels .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val commitComments = CommitComments .filter(_.byRepository(oldUserName, oldRepositoryName)).list
@@ -81,7 +82,7 @@
Repositories.filter { t =>
(t.parentUserName === oldUserName.bind) && (t.parentRepositoryName === oldRepositoryName.bind)
- }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)
+ }.map { t => t.parentUserName -> t.parentRepositoryName }.update(newUserName, newRepositoryName)
// Updates activity fk before deleting repository because activity is sorted by activityId
// and it can't be changed by deleting-and-inserting record.
@@ -92,17 +93,22 @@
deleteRepository(oldUserName, oldRepositoryName)
- WebHooks .insertAll(webHooks .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
- WebHookEvents.insertAll(webHookEvents .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+ RepositoryWebHooks .insertAll(webHooks .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+ RepositoryWebHookEvents.insertAll(webHookEvents .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
Milestones .insertAll(milestones .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+ Priorities .insertAll(priorities .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
IssueId .insertAll(issueId .map(_.copy(_1 = newUserName, _2 = newRepositoryName)) :_*)
val newMilestones = Milestones.filter(_.byRepository(newUserName, newRepositoryName)).list
+ val newPriorities = Priorities.filter(_.byRepository(newUserName, newRepositoryName)).list
Issues.insertAll(issues.map { x => x.copy(
userName = newUserName,
repositoryName = newRepositoryName,
milestoneId = x.milestoneId.map { id =>
newMilestones.find(_.title == milestones.find(_.milestoneId == id).get.title).get.milestoneId
+ },
+ priorityId = x.priorityId.map { id =>
+ newPriorities.find(_.priorityName == priorities.find(_.priorityId == id).get.priorityName).get.priorityId
}
)} :_*)
@@ -161,10 +167,11 @@
IssueComments .filter(_.byRepository(userName, repositoryName)).delete
PullRequests .filter(_.byRepository(userName, repositoryName)).delete
Issues .filter(_.byRepository(userName, repositoryName)).delete
+ Priorities .filter(_.byRepository(userName, repositoryName)).delete
IssueId .filter(_.byRepository(userName, repositoryName)).delete
Milestones .filter(_.byRepository(userName, repositoryName)).delete
- WebHooks .filter(_.byRepository(userName, repositoryName)).delete
- WebHookEvents .filter(_.byRepository(userName, repositoryName)).delete
+ RepositoryWebHooks .filter(_.byRepository(userName, repositoryName)).delete
+ RepositoryWebHookEvents .filter(_.byRepository(userName, repositoryName)).delete
DeployKeys .filter(_.byRepository(userName, repositoryName)).delete
Repositories .filter(_.byRepository(userName, repositoryName)).delete
diff --git a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
index 1647cba..248d122 100644
--- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
+++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
@@ -1,9 +1,9 @@
package gitbucket.core.service
-import gitbucket.core.util.{Directory, SyntaxSugars}
import gitbucket.core.util.Implicits._
-import Directory._
-import SyntaxSugars._
+import gitbucket.core.util.ConfigUtil._
+import gitbucket.core.util.Directory._
+import gitbucket.core.util.SyntaxSugars._
import SystemSettingsService._
import javax.servlet.http.HttpServletRequest
@@ -220,23 +220,28 @@
private val LdapSsl = "ldap.ssl"
private val LdapKeystore = "ldap.keystore"
- private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
- defining(props.getProperty(key)){ value =>
- if(value == null || value.isEmpty) default
- else convertType(value).asInstanceOf[A]
- }
+ private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
+ getSystemProperty(key).getOrElse(getEnvironmentVariable(key).getOrElse {
+ defining(props.getProperty(key)){ value =>
+ if(value == null || value.isEmpty){
+ default
+ } else {
+ convertType(value).asInstanceOf[A]
+ }
+ }
+ })
+ }
- private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
- defining(props.getProperty(key)){ value =>
- if(value == null || value.isEmpty) default
- else Some(convertType(value)).asInstanceOf[Option[A]]
- }
-
- private def convertType[A: ClassTag](value: String) =
- defining(implicitly[ClassTag[A]].runtimeClass){ c =>
- if(c == classOf[Boolean]) value.toBoolean
- else if(c == classOf[Int]) value.toInt
- else value
- }
+ private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] = {
+ getSystemProperty(key).orElse(getEnvironmentVariable(key).orElse {
+ defining(props.getProperty(key)){ value =>
+ if(value == null || value.isEmpty){
+ default
+ } else {
+ Some(convertType(value)).asInstanceOf[Option[A]]
+ }
+ }
+ })
+ }
}
diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala
index 2f060de..e6bb4c1 100644
--- a/src/main/scala/gitbucket/core/service/WebHookService.scala
+++ b/src/main/scala/gitbucket/core/service/WebHookService.scala
@@ -3,12 +3,12 @@
import fr.brouillard.oss.security.xhub.XHub
import fr.brouillard.oss.security.xhub.XHub.{XHubConverter, XHubDigest}
import gitbucket.core.api._
-import gitbucket.core.model.{Account, CommitComment, Issue, IssueComment, PullRequest, WebHook, WebHookEvent}
+import gitbucket.core.model.{Account, CommitComment, Issue, IssueComment, PullRequest, WebHook, RepositoryWebHook, RepositoryWebHookEvent, AccountWebHook, AccountWebHookEvent}
import gitbucket.core.model.Profile._
import gitbucket.core.model.Profile.profile.blockingApi._
import org.apache.http.client.utils.URLEncodedUtils
import gitbucket.core.util.JGitUtil.CommitInfo
-import gitbucket.core.util.RepositoryName
+import gitbucket.core.util.{RepositoryName, StringUtil}
import gitbucket.core.service.RepositoryService.RepositoryInfo
import org.apache.http.NameValuePair
import org.apache.http.client.entity.UrlEncodedFormEntity
@@ -18,7 +18,7 @@
import org.slf4j.LoggerFactory
import scala.concurrent._
-import scala.util.{Success, Failure}
+import scala.util.{Failure, Success}
import org.apache.http.HttpRequest
import org.apache.http.HttpResponse
import gitbucket.core.model.WebHookContentType
@@ -32,45 +32,86 @@
private val logger = LoggerFactory.getLogger(classOf[WebHookService])
/** get All WebHook informations of repository */
- def getWebHooks(owner: String, repository: String)(implicit s: Session): List[(WebHook, Set[WebHook.Event])] =
- WebHooks.filter(_.byRepository(owner, repository))
- .join(WebHookEvents).on { (w, t) => t.byWebHook(w) }
+ def getWebHooks(owner: String, repository: String)(implicit s: Session): List[(RepositoryWebHook, Set[WebHook.Event])] =
+ RepositoryWebHooks.filter(_.byRepository(owner, repository))
+ .join(RepositoryWebHookEvents).on { (w, t) => t.byRepositoryWebHook(w) }
.map { case (w, t) => w -> t.event }
.list.groupBy(_._1).mapValues(_.map(_._2).toSet).toList.sortBy(_._1.url)
/** get All WebHook informations of repository event */
- def getWebHooksByEvent(owner: String, repository: String, event: WebHook.Event)(implicit s: Session): List[WebHook] =
- WebHooks.filter(_.byRepository(owner, repository))
- .join(WebHookEvents).on { (wh, whe) => whe.byWebHook(wh) }
+ def getWebHooksByEvent(owner: String, repository: String, event: WebHook.Event)(implicit s: Session): List[RepositoryWebHook] =
+ RepositoryWebHooks.filter(_.byRepository(owner, repository))
+ .join(RepositoryWebHookEvents).on { (wh, whe) => whe.byRepositoryWebHook(wh) }
.filter { case (wh, whe) => whe.event === event.bind}
.map{ case (wh, whe) => wh }
.list.distinct
/** get All WebHook information from repository to url */
- def getWebHook(owner: String, repository: String, url: String)(implicit s: Session): Option[(WebHook, Set[WebHook.Event])] =
- WebHooks
+ def getWebHook(owner: String, repository: String, url: String)(implicit s: Session): Option[(RepositoryWebHook, Set[WebHook.Event])] =
+ RepositoryWebHooks
.filter(_.byPrimaryKey(owner, repository, url))
- .join(WebHookEvents).on { (w, t) => t.byWebHook(w) }
+ .join(RepositoryWebHookEvents).on { (w, t) => t.byRepositoryWebHook(w) }
.map { case (w, t) => w -> t.event }
.list.groupBy(_._1).mapValues(_.map(_._2).toSet).headOption
def addWebHook(owner: String, repository: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])(implicit s: Session): Unit = {
- WebHooks insert WebHook(owner, repository, url, ctype, token)
+ RepositoryWebHooks insert RepositoryWebHook(owner, repository, url, ctype, token)
events.map { event: WebHook.Event =>
- WebHookEvents insert WebHookEvent(owner, repository, url, event)
+ RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
}
}
def updateWebHook(owner: String, repository: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])(implicit s: Session): Unit = {
- WebHooks.filter(_.byPrimaryKey(owner, repository, url)).map(w => (w.ctype, w.token)).update((ctype, token))
- WebHookEvents.filter(_.byWebHook(owner, repository, url)).delete
+ RepositoryWebHooks.filter(_.byPrimaryKey(owner, repository, url)).map(w => (w.ctype, w.token)).update((ctype, token))
+ RepositoryWebHookEvents.filter(_.byRepositoryWebHook(owner, repository, url)).delete
events.map { event: WebHook.Event =>
- WebHookEvents insert WebHookEvent(owner, repository, url, event)
+ RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
}
}
def deleteWebHook(owner: String, repository: String, url :String)(implicit s: Session): Unit =
- WebHooks.filter(_.byPrimaryKey(owner, repository, url)).delete
+ RepositoryWebHooks.filter(_.byPrimaryKey(owner, repository, url)).delete
+
+ /** get All AccountWebHook informations of user */
+ def getAccountWebHooks(owner: String)(implicit s: Session): List[(AccountWebHook, Set[WebHook.Event])] =
+ AccountWebHooks.filter(_.byAccount(owner))
+ .join(AccountWebHookEvents).on { (w, t) => t.byAccountWebHook(w) }
+ .map { case (w, t) => w -> t.event }
+ .list.groupBy(_._1).mapValues(_.map(_._2).toSet).toList.sortBy(_._1.url)
+
+ /** get All AccountWebHook informations of repository event */
+ def getAccountWebHooksByEvent(owner: String, event: WebHook.Event)(implicit s: Session): List[AccountWebHook] =
+ AccountWebHooks.filter(_.byAccount(owner))
+ .join(AccountWebHookEvents).on { (wh, whe) => whe.byAccountWebHook(wh) }
+ .filter { case (wh, whe) => whe.event === event.bind}
+ .map{ case (wh, whe) => wh }
+ .list.distinct
+
+ /** get All AccountWebHook information from repository to url */
+ def getAccountWebHook(owner: String, url: String)(implicit s: Session): Option[(AccountWebHook, Set[WebHook.Event])] =
+ AccountWebHooks
+ .filter(_.byPrimaryKey(owner, url))
+ .join(AccountWebHookEvents).on { (w, t) => t.byAccountWebHook(w) }
+ .map { case (w, t) => w -> t.event }
+ .list.groupBy(_._1).mapValues(_.map(_._2).toSet).headOption
+
+ def addAccountWebHook(owner: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])(implicit s: Session): Unit = {
+ AccountWebHooks insert AccountWebHook(owner, url, ctype, token)
+ events.map { event: WebHook.Event =>
+ AccountWebHookEvents insert AccountWebHookEvent(owner, url, event)
+ }
+ }
+
+ def updateAccountWebHook(owner: String, url :String, events: Set[WebHook.Event], ctype: WebHookContentType, token: Option[String])(implicit s: Session): Unit = {
+ AccountWebHooks.filter(_.byPrimaryKey(owner, url)).map(w => (w.ctype, w.token)).update((ctype, token))
+ AccountWebHookEvents.filter(_.byAccountWebHook(owner, url)).delete
+ events.map { event: WebHook.Event =>
+ AccountWebHookEvents insert AccountWebHookEvent(owner, url, event)
+ }
+ }
+
+ def deleteAccountWebHook(owner: String, url :String)(implicit s: Session): Unit =
+ AccountWebHooks.filter(_.byPrimaryKey(owner, url)).delete
def callWebHookOf(owner: String, repository: String, event: WebHook.Event)(makePayload: => Option[WebHookPayload])
(implicit s: Session, c: JsonFormat.Context): Unit = {
@@ -78,6 +119,10 @@
if(webHooks.nonEmpty){
makePayload.map(callWebHook(event, webHooks, _))
}
+ val accountWebHooks = getAccountWebHooksByEvent(owner, event)
+ if(accountWebHooks.nonEmpty){
+ makePayload.map(callWebHook(event, accountWebHooks, _))
+ }
}
def callWebHook(event: WebHook.Event, webHooks: List[WebHook], payload: WebHookPayload)
@@ -160,7 +205,7 @@
import WebHookService._
// https://developer.github.com/v3/activity/events/types/#issuesevent
def callIssuesWebHook(action: String, repository: RepositoryService.RepositoryInfo, issue: Issue, baseUrl: String, sender: Account)
- (implicit s: Session, context:JsonFormat.Context): Unit = {
+ (implicit s: Session, context: JsonFormat.Context): Unit = {
callWebHookOf(repository.owner, repository.name, WebHook.Issues){
val users = getAccountsByUserNames(Set(repository.owner, issue.openedUserName), Set(sender))
for{
@@ -178,7 +223,7 @@
}
def callPullRequestWebHook(action: String, repository: RepositoryService.RepositoryInfo, issueId: Int, baseUrl: String, sender: Account)
- (implicit s: Session, context:JsonFormat.Context): Unit = {
+ (implicit s: Session, c: JsonFormat.Context): Unit = {
import WebHookService._
callWebHookOf(repository.owner, repository.name, WebHook.PullRequest){
for{
@@ -207,7 +252,7 @@
/** @return Map[(issue, issueUser, pullRequest, baseOwner, headOwner), webHooks] */
def getPullRequestsByRequestForWebhook(userName:String, repositoryName:String, branch:String)
- (implicit s: Session): Map[(Issue, Account, PullRequest, Account, Account), List[WebHook]] =
+ (implicit s: Session): Map[(Issue, Account, PullRequest, Account, Account), List[RepositoryWebHook]] =
(for{
is <- Issues if is.closed === false.bind
pr <- PullRequests if pr.byPrimaryKey(is.userName, is.repositoryName, is.issueId)
@@ -217,14 +262,14 @@
bu <- Accounts if bu.userName === pr.userName
ru <- Accounts if ru.userName === pr.requestUserName
iu <- Accounts if iu.userName === is.openedUserName
- wh <- WebHooks if wh.byRepository(is.userName , is.repositoryName)
- wht <- WebHookEvents if wht.event === WebHook.PullRequest.asInstanceOf[WebHook.Event].bind && wht.byWebHook(wh)
+ wh <- RepositoryWebHooks if wh.byRepository(is.userName , is.repositoryName)
+ wht <- RepositoryWebHookEvents if wht.event === WebHook.PullRequest.asInstanceOf[WebHook.Event].bind && wht.byRepositoryWebHook(wh)
} yield {
((is, iu, pr, bu, ru), wh)
}).list.groupBy(_._1).mapValues(_.map(_._2))
def callPullRequestWebHookByRequestBranch(action: String, requestRepository: RepositoryService.RepositoryInfo, requestBranch: String, baseUrl: String, sender: Account)
- (implicit s: Session, context:JsonFormat.Context): Unit = {
+ (implicit s: Session, c: JsonFormat.Context): Unit = {
import WebHookService._
for{
((issue, issueUser, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch)
@@ -246,12 +291,13 @@
callWebHook(WebHook.PullRequest, webHooks, payload)
}
}
+
}
trait WebHookPullRequestReviewCommentService extends WebHookService {
self: AccountService with RepositoryService with PullRequestService with IssuesService with CommitsService =>
def callPullRequestReviewCommentWebHook(action: String, comment: CommitComment, repository: RepositoryService.RepositoryInfo, issueId: Int, baseUrl: String, sender: Account)
- (implicit s: Session, context:JsonFormat.Context): Unit = {
+ (implicit s: Session, c: JsonFormat.Context): Unit = {
import WebHookService._
callWebHookOf(repository.owner, repository.name, WebHook.PullRequestReviewComment){
for{
@@ -285,7 +331,7 @@
import WebHookService._
def callIssueCommentWebHook(repository: RepositoryService.RepositoryInfo, issue: Issue, issueCommentId: Int, sender: Account)
- (implicit s: Session, context:JsonFormat.Context): Unit = {
+ (implicit s: Session, c: JsonFormat.Context): Unit = {
callWebHookOf(repository.owner, repository.name, WebHook.IssueComment){
for{
issueComment <- getComment(repository.owner, repository.name, issueCommentId.toString())
@@ -344,6 +390,17 @@
repositoryInfo,
owner= ApiUser(repositoryOwner))
)
+
+ def createDummyPayload(sender: Account): WebHookPushPayload =
+ WebHookPushPayload(
+ pusher = ApiPusher(sender),
+ sender = ApiUser(sender),
+ ref = "refs/heads/master",
+ before = "adc83b19e793491b1c6ea0fd8b46cd9f32e592fc",
+ after = "adc83b19e793491b1c6ea0fd8b46cd9f32e592fc",
+ commits = List.empty,
+ repository = ApiRepository.forDummyPayload(ApiUser(sender))
+ )
}
// https://developer.github.com/v3/activity/events/types/#issuesevent
@@ -470,4 +527,53 @@
sender = senderPayload)
}
}
+
+ // https://developer.github.com/v3/activity/events/types/#gollumevent
+ case class WebHookGollumPayload(
+ pages: Seq[WebHookGollumPagePayload],
+ repository: ApiRepository,
+ sender: ApiUser
+ ) extends WebHookPayload
+
+ case class WebHookGollumPagePayload(
+ page_name: String,
+ title: String,
+ summary: Option[String] = None,
+ action: String, // created or edited
+ sha: String, // SHA of the latest commit
+ html_url: ApiPath
+ )
+
+ object WebHookGollumPayload {
+ def apply(
+ action: String,
+ pageName: String,
+ sha: String,
+ repository: RepositoryInfo,
+ repositoryUser: Account,
+ sender: Account
+ ): WebHookGollumPayload = apply(Seq((action, pageName, sha)), repository, repositoryUser, sender)
+
+ def apply(
+ pages: Seq[(String, String, String)],
+ repository: RepositoryInfo,
+ repositoryUser: Account,
+ sender: Account
+ ): WebHookGollumPayload = {
+ WebHookGollumPayload(
+ pages = pages.map { case (action, pageName, sha) =>
+ WebHookGollumPagePayload(
+ action = action,
+ page_name = pageName,
+ title = pageName,
+ sha = sha,
+ html_url = ApiPath(s"/${RepositoryName(repository).fullName}/wiki/${StringUtil.urlDecode(pageName)}")
+ )
+ },
+ repository = ApiRepository(repository, repositoryUser),
+ sender = ApiUser(sender)
+ )
+ }
+ }
+
}
diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
index c4ffe41..a6af98b 100644
--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -1,6 +1,7 @@
package gitbucket.core.servlet
import java.io.File
+import java.util
import java.util.Date
import gitbucket.core.api
@@ -22,6 +23,7 @@
import javax.servlet.ServletConfig
import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
+import org.eclipse.jgit.diff.DiffEntry.ChangeType
import org.json4s.jackson.Serialization._
@@ -161,6 +163,12 @@
receivePack.setPostReceiveHook(hook)
}
}
+
+ if(repository.endsWith(".wiki")){
+ defining(request) { implicit r =>
+ receivePack.setPostReceiveHook(new WikiCommitHook(owner, repository.replaceFirst("\\.wiki$", ""), pusher, baseUrl))
+ }
+ }
}
}
@@ -170,7 +178,7 @@
import scala.collection.JavaConverters._
-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)/*(implicit session: Session)*/
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)
extends PostReceiveHook with PreReceiveHook
with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService
with WebHookPullRequestService with CommitsService {
@@ -185,9 +193,10 @@
// call pre-commit hook
PluginRegistry().getReceiveHooks
.flatMap(_.preReceive(owner, repository, receivePack, command, pusher))
- .headOption.foreach { error =>
- command.setResult(ReceiveCommand.Result.REJECTED_OTHER_REASON, error)
- }
+ .headOption
+ .foreach { error =>
+ command.setResult(ReceiveCommand.Result.REJECTED_OTHER_REASON, error)
+ }
}
using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
existIds = JGitUtil.getAllCommitIds(git)
@@ -285,8 +294,10 @@
// call web hook
callWebHookOf(owner, repository, WebHook.Push) {
- for (pusherAccount <- getAccountByUserName(pusher);
- ownerAccount <- getAccountByUserName(owner)) yield {
+ for {
+ pusherAccount <- getAccountByUserName(pusher)
+ ownerAccount <- getAccountByUserName(owner)
+ } yield {
WebHookPushPayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount,
newId = command.getNewId(), oldId = command.getOldId())
}
@@ -309,6 +320,67 @@
}
+class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl: String)
+ extends PostReceiveHook with WebHookService with AccountService with RepositoryService {
+
+ private val logger = LoggerFactory.getLogger(classOf[WikiCommitHook])
+
+ override def onPostReceive(receivePack: ReceivePack, commands: util.Collection[ReceiveCommand]): Unit = {
+ Database() withTransaction { implicit session =>
+ try {
+ commands.asScala.headOption.foreach { command =>
+ implicit val apiContext = api.JsonFormat.Context(baseUrl)
+ val refName = command.getRefName.split("/")
+ val commitIds = if (refName(1) == "tags") {
+ None
+ } else {
+ command.getType match {
+ case ReceiveCommand.Type.DELETE => None
+ case _ => Some((command.getOldId.getName, command.getNewId.name))
+ }
+ }
+
+ commitIds.map { case (oldCommitId, newCommitId) =>
+ val commits = using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
+ JGitUtil.getCommitLog(git, oldCommitId, newCommitId).flatMap { commit =>
+ val diffs = JGitUtil.getDiffs(git, commit.id, false)
+ diffs._1.collect { case diff if diff.newPath.toLowerCase.endsWith(".md") =>
+ val action = if(diff.changeType == ChangeType.ADD) "created" else "edited"
+ val fileName = diff.newPath
+ println(action + " - " + fileName + " - " + commit.id)
+ (action, fileName, commit.id)
+ }
+ }
+ }
+
+ val pages = commits
+ .groupBy { case (action, fileName, commitId) => fileName }
+ .map { case (fileName, commits) =>
+ (commits.head._1, fileName, commits.last._3)
+ }
+
+ callWebHookOf(owner, repository, WebHook.Gollum) {
+ for {
+ pusherAccount <- getAccountByUserName(pusher)
+ repositoryUser <- getAccountByUserName(owner)
+ repositoryInfo <- getRepository(owner, repository)
+ } yield {
+ WebHookGollumPayload(pages.toSeq, repositoryInfo, repositoryUser, pusherAccount)
+ }
+ }
+ }
+ }
+ } catch {
+ case ex: Exception => {
+ logger.error(ex.toString, ex)
+ throw ex
+ }
+ }
+ }
+ }
+
+}
+
object GitLfs {
case class BatchRequest(
diff --git a/src/main/scala/gitbucket/core/servlet/InitializeListener.scala b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala
index 94dfc81..d851ee7 100644
--- a/src/main/scala/gitbucket/core/servlet/InitializeListener.scala
+++ b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala
@@ -1,6 +1,6 @@
package gitbucket.core.servlet
-import java.io.File
+import java.io.{File, FileOutputStream}
import akka.event.Logging
import com.typesafe.config.ConfigFactory
@@ -9,15 +9,18 @@
import gitbucket.core.service.{ActivityService, SystemSettingsService}
import gitbucket.core.util.DatabaseConfig
import gitbucket.core.util.Directory._
+import gitbucket.core.util.SyntaxSugars._
import gitbucket.core.util.JDBCUtil._
import gitbucket.core.model.Profile.profile.blockingApi._
import io.github.gitbucket.solidbase.Solidbase
import io.github.gitbucket.solidbase.manager.JDBCVersionManager
-import javax.servlet.{ServletContextListener, ServletContextEvent}
-import org.apache.commons.io.FileUtils
+import javax.servlet.{ServletContextEvent, ServletContextListener}
+
+import org.apache.commons.io.{FileUtils, IOUtils}
import org.slf4j.LoggerFactory
-import akka.actor.{Actor, Props, ActorSystem}
+import akka.actor.{Actor, ActorSystem, Props}
import com.typesafe.akka.extension.quartz.QuartzSchedulerExtension
+
import scala.collection.JavaConverters._
/**
@@ -106,6 +109,22 @@
throw new IllegalStateException(s"Initialization failed. GitBucket version is ${gitbucketVersion}, but database version is ${databaseVersion}.")
}
+ // Install bundled plugins
+ logger.info("Install bundled plugins")
+ val cl = Thread.currentThread.getContextClassLoader
+ try {
+ using(cl.getResourceAsStream("plugins/plugins")){ pluginsFile =>
+ val plugins = IOUtils.toString(pluginsFile, "UTF-8").split("\n").map(_.trim)
+ plugins.collect { case plugin if plugin.nonEmpty && !plugin.startsWith("#") =>
+ val file = new File(PluginHome, plugin)
+ logger.info(s"Copy ${plugin} to ${file.getAbsolutePath}")
+ using(cl.getResourceAsStream("plugins/" + plugin), new FileOutputStream(file)){ case (in, out) => IOUtils.copy(in, out) }
+ }
+ }
+ } catch {
+ case e: Exception => logger.error("Error in installing bundled plugin", e)
+ }
+
// Load plugins
logger.info("Initialize plugins")
PluginRegistry.initialize(event.getServletContext, loadSystemSettings(), conn)
@@ -146,4 +165,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/gitbucket/core/util/DatabaseConfig.scala b/src/main/scala/gitbucket/core/util/DatabaseConfig.scala
index 644c3f2..1ef20dc 100644
--- a/src/main/scala/gitbucket/core/util/DatabaseConfig.scala
+++ b/src/main/scala/gitbucket/core/util/DatabaseConfig.scala
@@ -4,11 +4,15 @@
import java.io.File
import Directory._
-import com.github.takezoe.slick.blocking.{BlockingH2Driver, BlockingMySQLDriver, BlockingJdbcProfile}
+import ConfigUtil._
+import com.github.takezoe.slick.blocking.{BlockingH2Driver, BlockingJdbcProfile, BlockingMySQLDriver}
+import gitbucket.core.util.SyntaxSugars.defining
import liquibase.database.AbstractJdbcDatabase
import liquibase.database.core.{H2Database, MySQLDatabase, PostgresDatabase}
import org.apache.commons.io.FileUtils
+import scala.reflect.ClassTag
+
object DatabaseConfig {
private lazy val config = {
@@ -30,14 +34,14 @@
ConfigFactory.parseFile(file)
}
- private lazy val dbUrl = config.getString("db.url")
+ private lazy val dbUrl = getValue("db.url", config.getString) //config.getString("db.url")
def url(directory: Option[String]): String =
dbUrl.replace("${DatabaseHome}", directory.getOrElse(DatabaseHome))
lazy val url : String = url(None)
- lazy val user : String = config.getString("db.user")
- lazy val password : String = config.getString("db.password")
+ lazy val user : String = getValue("db.user", config.getString)
+ lazy val password : String = getValue("db.password", config.getString)
lazy val jdbcDriver : String = DatabaseType(url).jdbcDriver
lazy val slickDriver : BlockingJdbcProfile = DatabaseType(url).slickDriver
lazy val liquiDriver : AbstractJdbcDatabase = DatabaseType(url).liquiDriver
@@ -47,8 +51,16 @@
lazy val minimumIdle : Option[Int] = getOptionValue("db.minimumIdle" , config.getInt)
lazy val maximumPoolSize : Option[Int] = getOptionValue("db.maximumPoolSize" , config.getInt)
+ private def getValue[T](path: String, f: String => T): T = {
+ getSystemProperty(path).getOrElse(getEnvironmentVariable(path).getOrElse{
+ f(path)
+ })
+ }
+
private def getOptionValue[T](path: String, f: String => T): Option[T] = {
- if(config.hasPath(path)) Some(f(path)) else None
+ getSystemProperty(path).orElse(getEnvironmentVariable(path).orElse {
+ if(config.hasPath(path)) Some(f(path)) else None
+ })
}
}
@@ -80,7 +92,7 @@
}
object MySQL extends DatabaseType {
- val jdbcDriver = "com.mysql.jdbc.Driver"
+ val jdbcDriver = "org.mariadb.jdbc.Driver"
val slickDriver = BlockingMySQLDriver
val liquiDriver = new MySQLDatabase()
}
@@ -99,3 +111,33 @@
}
}
}
+
+object ConfigUtil {
+
+ def getEnvironmentVariable[A](key: String): Option[A] = {
+ val value = System.getenv("GITBUCKET_" + key.toUpperCase.replace('.', '_'))
+ if(value != null && value.nonEmpty){
+ Some(convertType(value)).asInstanceOf[Option[A]]
+ } else {
+ None
+ }
+ }
+
+ def getSystemProperty[A](key: String): Option[A] = {
+ val value = System.getProperty("gitbucket." + key)
+ if(value != null && value.nonEmpty){
+ Some(convertType(value)).asInstanceOf[Option[A]]
+ } else {
+ None
+ }
+ }
+
+ def convertType[A: ClassTag](value: String) =
+ defining(implicitly[ClassTag[A]].runtimeClass){ c =>
+ if(c == classOf[Boolean]) value.toBoolean
+ else if(c == classOf[Long]) value.toLong
+ else if(c == classOf[Int]) value.toInt
+ else value
+ }
+
+}
diff --git a/src/main/scala/gitbucket/core/util/FileUtil.scala b/src/main/scala/gitbucket/core/util/FileUtil.scala
index 4f2a21d..e31dd6b 100644
--- a/src/main/scala/gitbucket/core/util/FileUtil.scala
+++ b/src/main/scala/gitbucket/core/util/FileUtil.scala
@@ -68,9 +68,24 @@
def readableSize(size: Long): String = FileUtils.byteCountToDisplaySize(size)
+ /**
+ * Delete the given directory if it's empty.
+ * Do nothing if the given File is not a directory or not empty.
+ */
def deleteDirectoryIfEmpty(dir: File): Unit = {
if(dir.isDirectory() && dir.list().isEmpty) {
FileUtils.deleteDirectory(dir)
}
}
+
+ /**
+ * Delete file or directory forcibly.
+ */
+ def deleteIfExists(file: java.io.File): java.io.File = {
+ if(file.exists){
+ FileUtils.forceDelete(file)
+ }
+ file
+ }
+
}
diff --git a/src/main/scala/gitbucket/core/util/Notifier.scala b/src/main/scala/gitbucket/core/util/Notifier.scala
index 3c8dba5..3e8d39c 100644
--- a/src/main/scala/gitbucket/core/util/Notifier.scala
+++ b/src/main/scala/gitbucket/core/util/Notifier.scala
@@ -13,87 +13,157 @@
import org.slf4j.LoggerFactory
import gitbucket.core.controller.Context
import SystemSettingsService.Smtp
-import SyntaxSugars.defining
-trait Notifier extends RepositoryService with AccountService with IssuesService {
+/**
+ * The trait for notifications.
+ * This is used by notifications plugin, which provides notifications feature on GitBucket.
+ * Please see the plugin for details.
+ */
+trait Notifier {
- def toNotify(r: RepositoryService.RepositoryInfo, issue: Issue, content: String)
- (msg: String => String)(implicit context: Context): Unit
+ def toNotify(subject: String, msg: String)
+ (recipients: Account => Session => Seq[String])(implicit context: Context): Unit
- protected def recipients(issue: Issue, loginAccount: Account)(notify: String => Unit)(implicit session: Session) =
- (
- // individual repository's owner
- issue.userName ::
- // group members of group repository
- getGroupMembers(issue.userName).map(_.userName) :::
- // collaborators
- getCollaboratorUserNames(issue.userName, issue.repositoryName) :::
- // participants
- issue.openedUserName ::
- getComments(issue.userName, issue.repositoryName, issue.issueId).map(_.commentedUserName)
- )
- .distinct
- .withFilter ( _ != loginAccount.userName ) // the operation in person is excluded
- .foreach (
- getAccountByUserName(_)
- .filterNot (_.isGroupAccount)
- .filterNot (LDAPUtil.isDummyMailAddress(_))
- .foreach (x => notify(x.mailAddress))
- )
}
object Notifier {
- // TODO We want to be able to switch to mock.
def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
case settings if (settings.notification && settings.useSMTP) => new Mailer(settings.smtp.get)
case _ => new MockMailer
}
- def msgIssue(url: String) = (content: String) => s"""
- |${content}
- |--
- |View it on GitBucket
- """.stripMargin
- def msgPullRequest(url: String) = (content: String) => s"""
- |${content}
- |View, comment on, or merge it at:
- |${url}
- """.stripMargin
+ // TODO This class is temporary keeping the current feature until Notifications Plugin is available.
+ class IssueHook extends gitbucket.core.plugin.IssueHook
+ with RepositoryService with AccountService with IssuesService {
- def msgComment(url: String) = (content: String) => s"""
- |${content}
- |--
- |View it on GitBucket
- """.stripMargin
+ override def created(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+ Notifier().toNotify(
+ subject(issue, r),
+ message(issue.content getOrElse "", r)(content => s"""
+ |$content
+ |--
+ |View it on GitBucket
+ """.stripMargin)
+ )(recipients(issue))
+ }
- def msgStatus(url: String) = (content: String) => s"""
- |${content} #${url split('/') last}
- """.stripMargin
+ override def addedComment(commentId: Int, content: String, issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+ Notifier().toNotify(
+ subject(issue, r),
+ message(content, r)(content => s"""
+ |$content
+ |--
+ |View it on GitBucket
+ """.stripMargin)
+ )(recipients(issue))
+ }
+
+ override def closed(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+ Notifier().toNotify(
+ subject(issue, r),
+ message("close", r)(content => s"""
+ |$content #${issue.issueId}
+ """.stripMargin)
+ )(recipients(issue))
+ }
+
+ override def reopened(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+ Notifier().toNotify(
+ subject(issue, r),
+ message("reopen", r)(content => s"""
+ |$content #${issue.issueId}
+ """.stripMargin)
+ )(recipients(issue))
+ }
+
+
+ protected def subject(issue: Issue, r: RepositoryService.RepositoryInfo): String =
+ s"[${r.owner}/${r.name}] ${issue.title} (#${issue.issueId})"
+
+ protected def message(content: String, r: RepositoryService.RepositoryInfo)(msg: String => String)(implicit context: Context): String =
+ msg(Markdown.toHtml(
+ markdown = content,
+ repository = r,
+ enableWikiLink = false,
+ enableRefsLink = true,
+ enableAnchor = false,
+ enableLineBreaks = false
+ ))
+
+ protected val recipients: Issue => Account => Session => Seq[String] = {
+ issue => loginAccount => implicit session =>
+ (
+ // individual repository's owner
+ issue.userName ::
+ // group members of group repository
+ getGroupMembers(issue.userName).map(_.userName) :::
+ // collaborators
+ getCollaboratorUserNames(issue.userName, issue.repositoryName) :::
+ // participants
+ issue.openedUserName ::
+ getComments(issue.userName, issue.repositoryName, issue.issueId).map(_.commentedUserName)
+ )
+ .distinct
+ .withFilter ( _ != loginAccount.userName ) // the operation in person is excluded
+ .flatMap (
+ getAccountByUserName(_)
+ .filterNot (_.isGroupAccount)
+ .filterNot (LDAPUtil.isDummyMailAddress)
+ .map (_.mailAddress)
+ )
+ }
+ }
+
+ // TODO This class is temporary keeping the current feature until Notifications Plugin is available.
+ class PullRequestHook extends IssueHook with gitbucket.core.plugin.PullRequestHook {
+ override def created(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+ val url = s"${context.baseUrl}/${r.owner}/${r.name}/pull/${issue.issueId}"
+ Notifier().toNotify(
+ subject(issue, r),
+ message(issue.content getOrElse "", r)(content => s"""
+ |$content
+ |View, comment on, or merge it at:
+ |$url
+ """.stripMargin)
+ )(recipients(issue))
+ }
+
+ override def addedComment(commentId: Int, content: String, issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+ Notifier().toNotify(
+ subject(issue, r),
+ message(content, r)(content => s"""
+ |$content
+ |--
+ |View it on GitBucket
+ """.stripMargin)
+ )(recipients(issue))
+ }
+
+ override def merged(issue: Issue, r: RepositoryService.RepositoryInfo)(implicit context: Context): Unit = {
+ Notifier().toNotify(
+ subject(issue, r),
+ message("merge", r)(content => s"""
+ |$content #${issue.issueId}
+ """.stripMargin)
+ )(recipients(issue))
+ }
+ }
+
}
class Mailer(private val smtp: Smtp) extends Notifier {
private val logger = LoggerFactory.getLogger(classOf[Mailer])
- def toNotify(r: RepositoryService.RepositoryInfo, issue: Issue, content: String)
- (msg: String => String)(implicit context: Context): Unit = {
+ def toNotify(subject: String, msg: String)
+ (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = {
context.loginAccount.foreach { loginAccount =>
val database = Database()
val f = Future {
- database withSession { implicit session =>
- defining(
- s"[${r.owner}/${r.name}] ${issue.title} (#${issue.issueId})" ->
- msg(Markdown.toHtml(
- markdown = content,
- repository = r,
- enableWikiLink = false,
- enableRefsLink = true,
- enableAnchor = false,
- enableLineBreaks = false
- ))
- ) { case (subject, msg) =>
- recipients(issue, loginAccount) { to => send(to, subject, msg, loginAccount) }
+ database withSession { session =>
+ recipients(loginAccount)(session) foreach { to =>
+ send(to, subject, msg, loginAccount)
}
}
"Notifications Successful."
@@ -137,6 +207,6 @@
}
class MockMailer extends Notifier {
- def toNotify(r: RepositoryService.RepositoryInfo, issue: Issue, content: String)
- (msg: String => String)(implicit context: Context): Unit = {}
+ def toNotify(subject: String, msg: String)
+ (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = ()
}
diff --git a/src/main/scala/gitbucket/core/util/RepositoryName.scala b/src/main/scala/gitbucket/core/util/RepositoryName.scala
index e7d293d..9f0825b 100644
--- a/src/main/scala/gitbucket/core/util/RepositoryName.scala
+++ b/src/main/scala/gitbucket/core/util/RepositoryName.scala
@@ -1,7 +1,7 @@
package gitbucket.core.util
// TODO Move to gitbucket.core.api package?
-case class RepositoryName(owner:String, name:String){
+case class RepositoryName(owner: String, name: String){
val fullName = s"${owner}/${name}"
}
diff --git a/src/main/scala/gitbucket/core/util/StringUtil.scala b/src/main/scala/gitbucket/core/util/StringUtil.scala
index d1eadf3..908fd25 100644
--- a/src/main/scala/gitbucket/core/util/StringUtil.scala
+++ b/src/main/scala/gitbucket/core/util/StringUtil.scala
@@ -136,6 +136,4 @@
// }
// b.toString
// }
-
-
}
diff --git a/src/main/scala/gitbucket/core/util/Validations.scala b/src/main/scala/gitbucket/core/util/Validations.scala
index 13feccd..f34a1ee 100644
--- a/src/main/scala/gitbucket/core/util/Validations.scala
+++ b/src/main/scala/gitbucket/core/util/Validations.scala
@@ -20,6 +20,19 @@
}
/**
+ * Constraint for the password.
+ */
+ def password: Constraint = new Constraint(){
+ override def validate(name: String, value: String, messages: Messages): Option[String] =
+ if(!value.matches("[a-zA-Z0-9\\-_.]+")){
+ Some(s"${name} contains invalid character.")
+ } else {
+ None
+ }
+ }
+
+
+ /**
* Constraint for the repository identifier.
*/
def repository: Constraint = new Constraint(){
diff --git a/src/main/scala/gitbucket/core/view/Markdown.scala b/src/main/scala/gitbucket/core/view/Markdown.scala
index 88f8fff..a4d05b6 100644
--- a/src/main/scala/gitbucket/core/view/Markdown.scala
+++ b/src/main/scala/gitbucket/core/view/Markdown.scala
@@ -38,7 +38,6 @@
val source = if(enableTaskList) escapeTaskList(markdown) else markdown
val options = new Options()
- options.setSanitize(true)
options.setBreaks(enableLineBreaks)
val renderer = new GitBucketMarkedRenderer(options, repository,
diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index a065e66..62ab06b 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -2,8 +2,7 @@
personalTokens: List[gitbucket.core.model.AccessToken],
gneratedToken: Option[(gitbucket.core.model.AccessToken, String)])(implicit context: gitbucket.core.controller.Context)
@gitbucket.core.html.main("Applications"){
-
- @gitbucket.core.account.html.menu("application", context.settings.ssh){
+ @gitbucket.core.account.html.menu("application", context.loginAccount.get.userName, false){
Personal access tokens
@@ -49,5 +48,4 @@
}
-
}
diff --git a/src/main/twirl/gitbucket/core/account/creategroup.scala.html b/src/main/twirl/gitbucket/core/account/creategroup.scala.html
new file mode 100644
index 0000000..1e64635
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/creategroup.scala.html
@@ -0,0 +1,14 @@
+@(members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
+@gitbucket.core.html.main("Create group"){
+
+}
diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html
index 757e068..76e429e 100644
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -2,8 +2,7 @@
@import gitbucket.core.util.LDAPUtil
@import gitbucket.core.view.helpers
@gitbucket.core.html.main("Edit your profile"){
-
- @gitbucket.core.account.html.menu("profile", context.settings.ssh){
+ @gitbucket.core.account.html.menu("profile", context.loginAccount.get.userName, false){
@gitbucket.core.helper.html.information(info)
@gitbucket.core.helper.html.error(error)
@if(LDAPUtil.isDummyMailAddress(account)){
Please register your mail address.
}
@@ -61,7 +60,6 @@
}
-
}
diff --git a/src/main/twirl/gitbucket/core/account/groupform.scala.html b/src/main/twirl/gitbucket/core/account/groupform.scala.html
new file mode 100644
index 0000000..8a41b77
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/groupform.scala.html
@@ -0,0 +1,132 @@
+@(account: Option[gitbucket.core.model.Account],
+ members: List[gitbucket.core.model.GroupMember],
+ admin: Boolean)(implicit context: gitbucket.core.controller.Context)
+
+
+
+
+ Members
+
+ @gitbucket.core.helper.html.account("memberName", 200, true, false)
+
+
+
+
+
+
+
+
+
diff --git a/src/main/twirl/gitbucket/core/account/hooks.scala.html b/src/main/twirl/gitbucket/core/account/hooks.scala.html
new file mode 100644
index 0000000..1351c68
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/hooks.scala.html
@@ -0,0 +1,42 @@
+@(account: gitbucket.core.model.Account,
+ webHooks: List[(gitbucket.core.model.AccountWebHook, Set[gitbucket.core.model.WebHook.Event])],
+ info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Service Hooks"){
+ @gitbucket.core.account.html.menu("hooks", account.userName, account.isGroupAccount){
+ @gitbucket.core.helper.html.information(info)
+
+
+ Webhooks
+
+
+
+ Webhooks allow external services to be notified when certain events happen within your repository.
+ When the specified events happen, we’ll send a POST request to each of the URLs you provide.
+ Learn more in GitBucket Wiki Webhook Page .
+
+
Add webhook
+
+
+ @webHooks.map { case (webHook, events) =>
+
+
+ @webHook.url
+
+ (@events.map(_.name).mkString(", ") )
+
+
+
+ }
+
+
+
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html
index 4cdd5e5..1248bee 100644
--- a/src/main/twirl/gitbucket/core/account/main.scala.html
+++ b/src/main/twirl/gitbucket/core/account/main.scala.html
@@ -43,6 +43,9 @@
} else {
Public activity
}
+ @*
+ Webhooks
+ *@
@gitbucket.core.plugin.PluginRegistry().getProfileTabs.map { tab =>
@tab(account, context).map { link =>
@link.label
diff --git a/src/main/twirl/gitbucket/core/account/menu.scala.html b/src/main/twirl/gitbucket/core/account/menu.scala.html
index a36bb9a..16e0341 100644
--- a/src/main/twirl/gitbucket/core/account/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/account/menu.scala.html
@@ -1,24 +1,50 @@
-@(active: String, ssh: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
+@(active: String, userName: String, group: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html
index a8fe812..aece9ba 100644
--- a/src/main/twirl/gitbucket/core/account/ssh.scala.html
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -1,8 +1,7 @@
@(account: gitbucket.core.model.Account, sshKeys: List[gitbucket.core.model.SshKey])(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.ssh.SshUtil
@gitbucket.core.html.main("SSH Keys"){
-
- @gitbucket.core.account.html.menu("ssh", context.settings.ssh){
+ @gitbucket.core.account.html.menu("ssh", context.loginAccount.get.userName, false){
SSH Keys
@@ -37,5 +36,4 @@
}
-
}
diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html
index c7e3ab0..2789737 100644
--- a/src/main/twirl/gitbucket/core/admin/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -2,25 +2,42 @@
\ No newline at end of file
+
diff --git a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
index 7463451..ec28060 100644
--- a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
@@ -17,7 +17,7 @@
- @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) =>
+ @issues.map { case IssueInfo(issue, labels, milestone, priority, commentCount, commitStatus) =>
@issue.userName/@issue.repositoryName ・
diff --git a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
index ec18663..600ea73 100644
--- a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
@@ -14,11 +14,11 @@
} else {
@userRepositories.zipWithIndex.map { case (repository, i) =>
-
+
}
@@ -30,8 +30,8 @@
} else {
@recentRepositories.zipWithIndex.map { case (repository, i) =>
-
- @gitbucket.core.helper.html.repositoryicon(repository, false) @repository.owner/@repository.name
+
}
}
diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html
index 5d6ee39..ddb997c 100644
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -286,11 +286,11 @@
var table = diffText.closest("table[data-diff-id]");
var i = table.data("diff-id");
var ignoreWhiteSpace = table.find('.ignore-whitespace').prop('checked');
- diffUsingJS('oldText-'+i, 'newText-'+i, diffText.attr('id'), viewType, ignoreWhiteSpace);
+ diffUsingJS('oldText-' + i, 'newText-' + i, diffText.attr('id'), viewType, ignoreWhiteSpace);
var add = diffText.find("table").attr("add") * 1;
var del = diffText.find("table").attr("del") * 1;
- table.find(".diffstat").text(add+del+" ").append(renderStatBar(add,del)).attr("title",add+" additions & "+del+" deletions").tooltip();
- $('span.diffstat[data-diff-id="'+i+'"]')
+ table.find(".diffstat").text(add + del + " ").append(renderStatBar(add, del)).attr("title", add + " additions & " + del + " deletions").tooltip();
+ $('span.diffstat[data-diff-id="' + i + '"]')
.html('+' + add + ' -' + del + ' ')
.append(renderStatBar(add, del).attr('title', (add + del) + " lines changed").tooltip());
diff --git a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
index a98c53c..ea99758 100644
--- a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
@@ -2,43 +2,45 @@
prefix: String = "",
style : String = "",
right : Boolean = false,
- filter: String = "")(body: Html)
-
-
- @if(value.isEmpty){
-
- } else {
- @if(prefix.nonEmpty){
- @prefix:
- }
- @value
- }
-
-
-
-
-@if(filter.nonEmpty) {
-
-}
\ No newline at end of file
+
+ }
+}
diff --git a/src/main/twirl/gitbucket/core/helper/preview.scala.html b/src/main/twirl/gitbucket/core/helper/preview.scala.html
index 473dcd2..4ec4b09 100644
--- a/src/main/twirl/gitbucket/core/helper/preview.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html
@@ -44,6 +44,7 @@
$(function(){
@if(elastic){
$('#content@uid').elastic();
+ $('#content@uid').trigger('blur');
}
$('#preview@uid').click(function(){
diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html
index bd73e61..1522d79 100644
--- a/src/main/twirl/gitbucket/core/issues/create.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/create.scala.html
@@ -1,5 +1,7 @@
@(collaborators: List[String],
milestones: List[gitbucket.core.model.Milestone],
+ priorities: List[gitbucket.core.model.Priority],
+ defaultPriority: Option[gitbucket.core.model.Priority],
labels: List[gitbucket.core.model.Label],
isManageable: Boolean,
content: String,
@@ -29,7 +31,7 @@
- @gitbucket.core.issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map(x => (x, 0, 0)), labels, isManageable, repository)
+ @gitbucket.core.issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map(x => (x, 0, 0)), priorities, defaultPriority, labels, isManageable, repository)
diff --git a/src/main/twirl/gitbucket/core/issues/issue.scala.html b/src/main/twirl/gitbucket/core/issues/issue.scala.html
index e42ffbf..e42d6b9 100644
--- a/src/main/twirl/gitbucket/core/issues/issue.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/issue.scala.html
@@ -3,6 +3,7 @@
issueLabels: List[gitbucket.core.model.Label],
collaborators: List[String],
milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
+ priorities: List[gitbucket.core.model.Priority],
labels: List[gitbucket.core.model.Label],
isEditable: Boolean,
isManageable: Boolean,
@@ -54,7 +55,7 @@
@gitbucket.core.issues.html.commentform(issue, true, isEditable, isManageable, repository)
- @gitbucket.core.issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, isManageable, repository)
+ @gitbucket.core.issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, priorities, None, labels, isManageable, repository)
}
diff --git a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
index 0e61892..4b0fb88 100644
--- a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
@@ -3,6 +3,8 @@
issueLabels: List[gitbucket.core.model.Label],
collaborators: List[String],
milestones: List[(gitbucket.core.model.Milestone, Int, Int)],
+ priorities: List[gitbucket.core.model.Priority],
+ defaultPriority: Option[gitbucket.core.model.Priority],
labels: List[gitbucket.core.model.Label],
isManageable: Boolean,
repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
@@ -11,7 +13,7 @@
Labels
@if(isManageable){
}
- @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) =>
+ @issues.map { case IssueInfo(issue, labels, milestone, priority, commentCount, commitStatus) =>
@if(isManageable){
@@ -208,6 +243,10 @@
#@issue.issueId opened @gitbucket.core.helper.html.datetimeago(issue.registeredDate) by @helpers.user(issue.openedUserName, styleClass="username")
+ @priority.map(priority => priorities.filter(p => p.priorityName == priority).head).map { priority =>
+
+ @priority.priorityName
+ }
@milestone.map { milestone =>
@milestone
}
diff --git a/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html b/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html
new file mode 100644
index 0000000..3219b4b
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html
@@ -0,0 +1,67 @@
+@(priority: Option[gitbucket.core.model.Priority],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@defining(priority.map(_.priorityId).getOrElse("new")){ priorityId =>
+
+
+}
diff --git a/src/main/twirl/gitbucket/core/issues/priorities/list.scala.html b/src/main/twirl/gitbucket/core/issues/priorities/list.scala.html
new file mode 100644
index 0000000..185ba84
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/priorities/list.scala.html
@@ -0,0 +1,124 @@
+@(priorities: List[gitbucket.core.model.Priority],
+ counts: Map[String, Int],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main(s"Priorities - ${repository.owner}/${repository.name}"){
+ @gitbucket.core.html.menu("priorities", repository){
+ @if(hasWritePermission){
+
+ }
+
+
+
+
+
+
+ @priorities.map { priority =>
+ @gitbucket.core.issues.priorities.html.priority(priority, counts, repository, hasWritePermission)
+ }
+
+
+ No priorities to show.
+ @if(hasWritePermission){
+ Click on the "New priority" button above to create one.
+ }
+
+
+
+
+ }
+}
+
diff --git a/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html b/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html
new file mode 100644
index 0000000..637b11a
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html
@@ -0,0 +1,49 @@
+@(priority: gitbucket.core.model.Priority,
+ counts: Map[String, Int],
+ repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+
+
+
+
+ @if(hasWritePermission) {
+
+ }
+
+
+
+ @priority.description.getOrElse("")
+
+
+
+ @if(hasWritePermission){
+
+ } else if(priority.isDefault) {
+
+ }
+
+
+
+
+ @counts.get(priority.priorityName).getOrElse(0) open issues
+
+
+ @if(hasWritePermission){
+
+ }
+
+
+
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index 13d0411..2324f6e 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -15,11 +15,15 @@
-
-
+
+
+
+
+
+
@@ -36,13 +40,13 @@
@repository.map { repository =>
}
-
+
-
+
- @if(branch.mergeInfo.isEmpty){
+ @if(repository.repository.defaultBranch == branch.name){
Default
} else {
@branch.mergeInfo.map{ info =>
@@ -38,47 +38,49 @@
- @branch.mergeInfo.map{ info =>
- @prs.map{ case (pull, issue) =>
-
#@issue.issueId
- @if(issue.closed) {
- @if(info.isMerged){
-
Merged
- } else {
-
Closed
+ @if(repository.repository.defaultBranch != branch.name){
+ @branch.mergeInfo.map{ info =>
+ @prs.map{ case (pull, issue) =>
+
#@issue.issueId
+ @if(issue.closed) {
+ @if(info.isMerged){
+
Merged
+ } else {
+
Closed
+ }
+ } else {
+
Open
+ }
+ }.getOrElse{
+ @if(context.loginAccount.isDefined){
+
New Pull request
+ } else {
+
Compare
+ }
}
- } else {
-
Open
- }
- }.getOrElse{
- @if(context.loginAccount.isDefined){
-
New Pull request
- } else {
-
Compare
- }
- }
- @if(hasWritePermission){
-
- @if(prs.map(!_._2.closed).getOrElse(false)){
-
- } else {
- @if(isProtected){
-
- } else {
-
+ @if(hasWritePermission){
+
+ @if(prs.map(!_._2.closed).getOrElse(false)){
+
+ } else {
+ @if(isProtected){
+
+ } else {
+
+ }
+ }
+
}
}
-
}
- }
diff --git a/src/main/twirl/gitbucket/core/repo/commentform.scala.html b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
index 9730966..1908c00 100644
--- a/src/main/twirl/gitbucket/core/repo/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
@@ -8,10 +8,7 @@
@import gitbucket.core.view.helpers
@if(context.loginAccount.isDefined){
@if(!fileName.isDefined){ }
-