diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 49d184a..507d345 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,6 +1,7 @@ # Guideline for Issues -- At first, See [FAQ](https://github.com/gitbucket/gitbucket/wiki/FAQ) and check issues whether there is a same question or request in the past. +- At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past. - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue. -- We can also support in Japaneses other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja). +- We can also support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja). - Write an issue in English. At least, write subject in English. +- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. 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 889f1e2..df5d6da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ - 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 @@ -16,3 +17,22 @@ - $HOME/.coursier - $HOME/.embedmysql - $HOME/.embedpostgresql +matrix: + include: + - dist: trusty + group: edge + sudo: required + jdk: oraclejdk9 + script: + # https://github.com/sbt/sbt/pull/2951 + - git clone https://github.com/retronym/java9-rt-export + - cd java9-rt-export/ + - git checkout 1019a2873d057dd7214f4135e84283695728395d + - jdk_switcher use oraclejdk8 + - sbt package + - jdk_switcher use oraclejdk9 + - 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 .. + - 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/LICENSE b/LICENSE index b98f26a..8dada3e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -179,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -187,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2013-2016 GitBucket Team + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index d3813a8..6ee2f01 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,35 @@ GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) ========= -GitBucket is a Git platform powered by Scala offering: +GitBucket is a Git web platform powered by Scala offering: + - Easy installation +- Intuitive UI - High extensibility by plugins - API compatibility with GitHub +You can try an [online demo](https://gitbucket.herokuapp.com/) *(ID: root / Pass: root)* of GitBucket, and also get the latest information at [GitBucket News](https://gitbucket.github.io/gitbucket-news/). + Features -------- -The current version of GitBucket provides a basic features below: +The current version of GitBucket provides many features such as: -- Public / Private Git repository (http and ssh access) +- Public / Private Git repositories (with http/https and ssh access) - GitLFS support -- Repository viewer includes online file editor -- Issues, Pull request and Wiki for repositories -- Activity timeline and email notification +- Repository viewer including an online file editor +- Issues, Pull Requests and Wiki for repositories +- Activity timeline and email notifications - Account and group management with LDAP integration -- Plug-in system +- a Plug-in system If you want to try the development version of GitBucket, see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md). Installation -------- -GitBucket requires **Java8**. You have to install it if it is not already installed. +GitBucket requires **Java8**. You have to install it, if it is not already installed. 1. Download the latest **gitbucket.war** from [the releases page](https://github.com/gitbucket/gitbucket/releases) and run it by `java -jar gitbucket.war`. -2. Go to `http://[hostname]:8080/` and log in with **root** / **root**. +2. Go to `http://[hostname]:8080/` and log in with ID: **root** / Pass: **root**. You can specify following options: @@ -34,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). @@ -45,24 +52,42 @@ Plugins -------- -GitBucket has a plug-in system to allow extensions to GitBucket. We provide some official plug-ins: +GitBucket has a plug-in system that allows extra functionality. Officially the following plug-ins are provided: - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin) - [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin) +- [gitbucket-pages-plugin](https://github.com/gitbucket/gitbucket-pages-plugin) You can find more plugins made by the community at [GitBucket community plugins](http://gitbucket-plugins.github.io/). Support -------- -- If you have any questions about GitBucket, send it to the [gitter room](https://gitter.im/gitbucket/gitbucket) before opening an issue. -- Make sure check whether there is the same question or request in the past. -- When raise a new issue, write at least the subject in **English**. -- We can also provide support in Japanese at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja). -- The first priority of GitBucket is easy installation and API compatibility with GitHub, so we might reject if your request is against it. +- If you have any questions about GitBucket, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues whether there is a same question or request in the past. +- If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue. +- We can also provide support in Japanese other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja). +- Write an issue in English. At least, write subject in English. +- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. Release Notes ------------- +### 4.13 - 29 May 2017 +- Uploading files into the repository +- HTML is available in Markdown +- Added filter box to dropdown menus + +### 4.12 - 30 Apr 2017 +- [Gist plug-in](https://github.com/gitbucket/gitbucket-gist-plugin) provides JavaScript to embed snippet +- Dropdown menu filter in the branch comparing page +- Caution for the embedded H2 database + +### 4.11 - 1 Apr 2017 +- Deploy keys support +- Auto generate avatar images +- Collaborators of the private forked repository are copied from the original repository +- Cache avatar images in the browser +- New extension point to receive events about repository + ### 4.10 - 25 Feb 2017 - Update to Scala 2.12, Scalatra 2.5 and Slick 3.2 - Display file size in the file viewer diff --git a/build.sbt b/build.sbt index d219ff3..00ffd44 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ val Organization = "io.github.gitbucket" val Name = "gitbucket" -val GitBucketVersion = "4.10.0" +val GitBucketVersion = "4.13.0" 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) @@ -10,7 +10,7 @@ organization := Organization name := Name version := GitBucketVersion -scalaVersion := "2.12.1" +scalaVersion := "2.12.2" // dependency settings resolvers ++= Seq( @@ -21,30 +21,30 @@ "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/" ) libraryDependencies ++= Seq( - "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.6.0.201612231935-r", - "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.6.0.201612231935-r", + "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.7.0.201704051617-r", + "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", + "mysql" % "mysql-connector-java" % "6.0.6", + "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", @@ -54,12 +54,13 @@ "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.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 -scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:_") +scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method") javacOptions in compile ++= Seq("-target", "8", "-source", "8") javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml" diff --git a/doc/how_to_run.md b/doc/how_to_run.md index ea31909..9db0789 100644 --- a/doc/how_to_run.md +++ b/doc/how_to_run.md @@ -1,18 +1,24 @@ How to run from the source tree ======== +Install [sbt](http://www.scala-sbt.org/index.html) at first. + +``` +$ brew install sbt +``` + Run for Development -------- -If you want to test GitBucket, input following command at the root directory of the source tree. +If you want to test GitBucket, type the following command in the root directory of the source tree. ``` $ sbt ~jetty:start ``` -Then access to `http://localhost:8080/` by your browser. The default administrator account is `root` and password is `root`. +Then access `http://localhost:8080/` in your browser. The default administrator account is `root` and password is `root`. -Source code modification is detected and reloaded automatically. You can modify logging configuration by editing `src/main/resources/logback-dev.xml`. +Source code modifications are detected and a reloaded happens automatically. You can modify the logging configuration by editing `src/main/resources/logback-dev.xml`. Build war file -------- @@ -23,9 +29,9 @@ $ sbt package ``` -`gitbucket_2.11-x.x.x.war` is generated into `target/scala-2.11`. +`gitbucket_2.12-x.x.x.war` is generated into `target/scala-2.12`. -To build executable war file, run +To build an executable war file, run ``` $ sbt executable @@ -35,8 +41,8 @@ Run tests spec --------- -To run the full serie of tests, run the following command: +To run the full series of tests, run the following command: ``` -sbt test +$ sbt test ``` diff --git a/doc/notification.md b/doc/notification.md index 90a88bb..db0e48d 100644 --- a/doc/notification.md +++ b/doc/notification.md @@ -1,7 +1,7 @@ Notification Email ======== -GitBucket sends email to target users by enabling the notification email by an administrator. +GitBucket can send email notification to users if this feature is enabled by an administrator. The timing of the notification are as follows: @@ -17,7 +17,8 @@ Notified users are as follows: * individual repository's owner +* group members of group repository * collaborators * participants -However, the operation in person is excluded from the target. +However, the person performing the operation is excluded from the notification. diff --git a/doc/release.md b/doc/release.md index 682dc88..d417cb7 100644 --- a/doc/release.md +++ b/doc/release.md @@ -34,8 +34,6 @@ Generate release files -------- -Note: Release operation requires [Ant](http://ant.apache.org/) and [Maven](https://maven.apache.org/). - ### Make release war file Run `sbt executable`. The release war file and fingerprint are generated into `target/executable/gitbucket.war`. @@ -52,4 +50,12 @@ $ sbt publish-signed ``` -Then operate release sequence at https://oss.sonatype.org/. +Then logged-in https://oss.sonatype.org/ and delete following files from the staging repository: + +- gitbucket_2.12-x.x.x.war +- gitbucket_2.12-x.x.x.war.asc +- gitbucket_2.12-x.x.x.war.asc.md5 +- gitbucket_2.12-x.x.x.war.asc.sha1 +- gitbucket_2.12-x.x.x.war.md5 + +At last, close and release the repository. 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/sbt-launch-0.13.12.jar b/sbt-launch-0.13.12.jar deleted file mode 100644 index 871dedd..0000000 --- a/sbt-launch-0.13.12.jar +++ /dev/null Binary files differ diff --git a/sbt.bat b/sbt.bat deleted file mode 100644 index bfc44ca..0000000 --- a/sbt.bat +++ /dev/null @@ -1,2 +0,0 @@ -set SCRIPT_DIR=%~dp0 -java %JAVA_OPTS% -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.12.jar" %* diff --git a/sbt.sh b/sbt.sh deleted file mode 100755 index 55d0be1..0000000 --- a/sbt.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -java $JAVA_OPTS -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.12.jar "$@" diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index d810941..8b91e91 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -1,4 +1,9 @@ +import org.eclipse.jetty.server.ConnectionFactory; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.StatisticsHandler; import org.eclipse.jetty.webapp.WebAppContext; import java.io.File; @@ -8,6 +13,8 @@ public class JettyLauncher { public static void main(String[] args) throws Exception { + System.setProperty("java.awt.headless", "true"); + String host = null; int port = 8080; InetSocketAddress address = null; @@ -19,19 +26,28 @@ if(arg.startsWith("--") && arg.contains("=")) { String[] dim = arg.split("="); if(dim.length >= 2) { - if(dim[0].equals("--host")) { - host = dim[1]; - } else if(dim[0].equals("--port")) { - port = Integer.parseInt(dim[1]); - } else if(dim[0].equals("--prefix")) { - contextPath = dim[1]; - if(!contextPath.startsWith("/")){ - contextPath = "/" + contextPath; - } - } else if(dim[0].equals("--gitbucket.home")){ - System.setProperty("gitbucket.home", dim[1]); - } else if(dim[0].equals("--temp_dir")){ - tmpDirPath = dim[1]; + switch (dim[0]) { + case "--host": + host = dim[1]; + break; + case "--port": + port = Integer.parseInt(dim[1]); + break; + case "--prefix": + contextPath = dim[1]; + if (!contextPath.startsWith("/")) { + contextPath = "/" + contextPath; + } + break; + case "--max_file_size": + System.setProperty("gitbucket.maxFileSize", dim[2]); + break; + case "--gitbucket.home": + System.setProperty("gitbucket.home", dim[1]); + break; + case "--temp_dir": + tmpDirPath = dim[1]; + break; } } } @@ -54,6 +70,15 @@ // connector.setPort(port); // server.addConnector(connector); + // Disabling Server header + for (Connector connector : server.getConnectors()) { + for (ConnectionFactory factory : connector.getConnectionFactories()) { + if (factory instanceof HttpConnectionFactory) { + ((HttpConnectionFactory) factory).getHttpConfiguration().setSendServerVersion(false); + } + } + } + WebAppContext context = new WebAppContext(); File tmpDir; @@ -74,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(); @@ -85,7 +113,9 @@ context.setInitParameter("org.scalatra.ForceHttps", "true"); } - server.setHandler(context); + Handler handler = addStatisticsHandler(context); + + server.setHandler(handler); server.setStopAtShutdown(true); server.setStopTimeout(7_000); server.start(); @@ -114,4 +144,12 @@ } 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 + final StatisticsHandler statisticsHandler = new StatisticsHandler(); + statisticsHandler.setHandler(handler); + return statisticsHandler; + } } 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..9f8a9a7 --- /dev/null +++ b/src/main/resources/update/gitbucket-core_4.14.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala index 949bf80..f9be729 100644 --- a/src/main/scala/ScalatraBootstrap.scala +++ b/src/main/scala/ScalatraBootstrap.scala @@ -44,6 +44,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 dd8665d..8d678b3 100644 --- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala +++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala @@ -31,5 +31,12 @@ new Version("4.10.0"), new Version("4.11.0", new LiquibaseMigration("update/gitbucket-core_4.11.xml") + ), + new Version("4.12.0"), + new Version("4.12.1"), + new Version("4.13.0"), + new Version("4.14.0", + new LiquibaseMigration("update/gitbucket-core_4.14.xml"), + new SqlMigration("update/gitbucket-core_4.14.sql") ) ) diff --git a/src/main/scala/gitbucket/core/api/ApiContents.scala b/src/main/scala/gitbucket/core/api/ApiContents.scala index 1d5753b..8b3735a 100644 --- a/src/main/scala/gitbucket/core/api/ApiContents.scala +++ b/src/main/scala/gitbucket/core/api/ApiContents.scala @@ -1,8 +1,9 @@ package gitbucket.core.api +import java.util.Base64 + import gitbucket.core.util.JGitUtil.FileInfo import gitbucket.core.util.RepositoryName -import org.apache.commons.codec.binary.Base64 case class ApiContents( `type`: String, @@ -20,7 +21,7 @@ ApiContents("dir", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName) } else { content.map(arr => - ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, Some(Base64.encodeBase64String(arr)), Some("base64"))(repositoryName) + ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, Some(Base64.getEncoder.encodeToString(arr)), Some("base64"))(repositoryName) ).getOrElse(ApiContents("file", fileInfo.name, fileInfo.path, fileInfo.commitId, None, None)(repositoryName)) } } diff --git a/src/main/scala/gitbucket/core/api/ApiRepository.scala b/src/main/scala/gitbucket/core/api/ApiRepository.scala index e1d88d9..1f79072 100644 --- a/src/main/scala/gitbucket/core/api/ApiRepository.scala +++ b/src/main/scala/gitbucket/core/api/ApiRepository.scala @@ -37,7 +37,7 @@ name = repository.repositoryName, full_name = s"${repository.userName}/${repository.repositoryName}", description = repository.description.getOrElse(""), - watchers = 0, + watchers = watchers, forks = forkedCount, `private` = repository.isPrivate, default_branch = repository.defaultBranch, diff --git a/src/main/scala/gitbucket/core/api/CreateAStatus.scala b/src/main/scala/gitbucket/core/api/CreateAStatus.scala index 3871999..f8c087f 100644 --- a/src/main/scala/gitbucket/core/api/CreateAStatus.scala +++ b/src/main/scala/gitbucket/core/api/CreateAStatus.scala @@ -19,8 +19,8 @@ def isValid: Boolean = { CommitState.valueOf(state).isDefined && // only http - target_url.filterNot(f => "\\Ahttps?://".r.findPrefixOf(f).isDefined && f.length<255).isEmpty && - context.filterNot(f => f.length<255).isEmpty && - description.filterNot(f => f.length<1000).isEmpty + target_url.forall(f => "\\Ahttps?://".r.findPrefixOf(f).isDefined && f.length < 255) && + context.forall(f => f.length < 255) && + description.forall(f => f.length < 1000) } } diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index f050be4..1ca84b7 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -20,13 +20,13 @@ 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()))), @@ -60,31 +60,31 @@ val sshKeyForm = mapping( "title" -> trim(label("Title", text(required, maxlength(100)))), - "publicKey" -> trim(label("Key" , text(required, validPublicKey))) + "publicKey" -> trim2(label("Key" , text(required, validPublicKey))) )(SshKeyForm.apply) val personalTokenForm = mapping( - "note" -> trim(label("Token", text(required, maxlength(100)))) + "note" -> trim(label("Token", text(required, maxlength(100)))) )(PersonalTokenForm.apply) case class NewGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String) case class EditGroupForm(groupName: String, description: Option[String], url: Option[String], fileId: Option[String], members: String, clearImage: Boolean) val newGroupForm = mapping( - "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))), + "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName, reservedNames))), "description" -> trim(label("Group description", optional(text()))), - "url" -> trim(label("URL" ,optional(text(maxlength(200))))), - "fileId" -> trim(label("File ID" ,optional(text()))), - "members" -> trim(label("Members" ,text(required, members))) + "url" -> trim(label("URL" ,optional(text(maxlength(200))))), + "fileId" -> trim(label("File ID" ,optional(text()))), + "members" -> trim(label("Members" ,text(required, members))) )(NewGroupForm.apply) val editGroupForm = mapping( - "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier))), + "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier))), "description" -> trim(label("Group description", optional(text()))), - "url" -> trim(label("URL" ,optional(text(maxlength(200))))), - "fileId" -> trim(label("File ID" ,optional(text()))), - "members" -> trim(label("Members" ,text(required, members))), - "clearImage" -> trim(label("Clear image" ,boolean())) + "url" -> trim(label("URL" ,optional(text(maxlength(200))))), + "fileId" -> trim(label("File ID" ,optional(text()))), + "members" -> trim(label("Members" ,text(required, members))), + "clearImage" -> trim(label("Clear image" ,boolean())) )(EditGroupForm.apply) case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean) @@ -197,10 +197,20 @@ get("/:userName/_avatar"){ val userName = params("userName") - getAccountByUserName(userName).flatMap(_.image).map { image => - RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image)) - } getOrElse { - contentType = "image/png" + contentType = "image/png" + getAccountByUserName(userName).flatMap{ account => + response.setDateHeader("Last-Modified", account.updatedDate.getTime) + account.image.map{ image => + Some(RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))) + }.getOrElse{ + if (account.isGroupAccount) { + TextAvatarUtil.textGroupAvatar(account.fullName) + } else { + TextAvatarUtil.textAvatar(account.fullName) + } + } + }.getOrElse{ + response.setHeader("Cache-Control", "max-age=3600") Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png") } } @@ -244,9 +254,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("/") } @@ -450,13 +464,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("/") }) diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala index ab2a0f1..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 @@ -125,7 +127,7 @@ get ("/api/v3/repos/:owner/:repo/branches/:branch")(referrersOnly { repository => //import gitbucket.core.api._ (for{ - branch <- params.get("branch") if repository.branchList.find(_ == branch).isDefined + branch <- params.get("branch") if repository.branchList.contains(branch) br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch) } yield { val protection = getProtectedBranchInfo(repository.owner, repository.name, branch) @@ -287,7 +289,7 @@ patch("/api/v3/repos/:owner/:repo/branches/:branch")(ownerOnly { repository => import gitbucket.core.api._ (for{ - branch <- params.get("branch") if repository.branchList.find(_ == branch).isDefined + branch <- params.get("branch") if repository.branchList.contains(branch) protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection) br <- getBranches(repository.owner, repository.name, repository.repository.defaultBranch, repository.repository.originUserName.isEmpty).find(_.name == branch) } yield { @@ -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/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala index ceff777..d79d86d 100644 --- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala @@ -40,10 +40,6 @@ contentType = formats("json") } -// TODO Scala 2.11 -// // Don't set content type via Accept header. -// override def format(implicit request: HttpServletRequest) = "" - override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try { val httpRequest = request.asInstanceOf[HttpServletRequest] val httpResponse = response.asInstanceOf[HttpServletResponse] @@ -151,7 +147,6 @@ } } - // TODO Scala 2.11 override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty, includeContextPath: Boolean = true, includeServletPath: Boolean = true, absolutize: Boolean = true, withSessionId: Boolean = true) @@ -160,6 +155,18 @@ else baseUrl + super.url(path, params, false, false, false) /** + * Extends scalatra-form's trim rule to eliminate CR and LF. + */ + protected def trim2[T](valueType: SingleValueType[T]): SingleValueType[T] = new SingleValueType[T](){ + def convert(value: String, messages: Messages): T = valueType.convert(trim(value), messages) + + override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Seq[(String, String)] = + valueType.validate(name, trim(value), params, messages) + + private def trim(value: String): String = if(value == null) null else value.replaceAll("\r\n", "").trim + } + + /** * Use this method to response the raw data against XSS. */ protected def RawData[T](contentType: String, rawData: T): T = { 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/IndexController.scala b/src/main/scala/gitbucket/core/controller/IndexController.scala index 9d0316f..524f26f 100644 --- a/src/main/scala/gitbucket/core/controller/IndexController.scala +++ b/src/main/scala/gitbucket/core/controller/IndexController.scala @@ -26,13 +26,13 @@ "password" -> trim(label("Password", text(required))) )(SignInForm.apply) - val searchForm = mapping( - "query" -> trim(text(required)), - "owner" -> trim(text(required)), - "repository" -> trim(text(required)) - )(SearchForm.apply) - - case class SearchForm(query: String, owner: String, repository: String) +// val searchForm = mapping( +// "query" -> trim(text(required)), +// "owner" -> trim(text(required)), +// "repository" -> trim(text(required)) +// )(SearchForm.apply) +// +// case class SearchForm(query: String, owner: String, repository: String) get("/"){ @@ -163,7 +163,7 @@ get("/search"){ val query = params.getOrElse("query", "").trim.toLowerCase - val visibleRepositories = getVisibleRepositories(context.loginAccount, None) + val visibleRepositories = getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true) val repositories = visibleRepositories.filter { repository => repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0 } 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 2d911bb..6a2795f 100644 --- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala @@ -40,7 +40,7 @@ ) val optionsForm = mapping( - "repositoryName" -> trim(label("Repository Name" , text(required, maxlength(100), identifier, renameRepositoryName))), + "repositoryName" -> trim(label("Repository Name" , text(required, maxlength(100), repository, renameRepositoryName))), "description" -> trim(label("Description" , optional(text()))), "isPrivate" -> trim(label("Repository Type" , boolean())), "issuesOption" -> trim(label("Issues Option" , text(required, featureOption))), @@ -63,7 +63,7 @@ val deployKeyForm = mapping( "title" -> trim(label("Title", text(required, maxlength(100)))), - "publicKey" -> trim(label("Key" , text(required))), // TODO duplication check in the repository? + "publicKey" -> trim2(label("Key" , text(required))), // TODO duplication check in the repository? "allowWrite" -> trim(label("Key" , boolean())) )(DeployKeyForm.apply) @@ -139,6 +139,12 @@ FileUtils.moveDirectory(dir, getLfsDir(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)) @@ -157,7 +163,7 @@ /** Update default branch */ post("/:owner/:repository/settings/update_default_branch", defaultBranchForm)(ownerOnly { (form, repository) => - if(repository.branchList.find(_ == form.defaultBranch).isEmpty){ + if(!repository.branchList.contains(form.defaultBranch)){ redirect(s"/${repository.owner}/${repository.name}/settings/options") } else { saveRepositoryDefaultBranch(repository.owner, repository.name, form.defaultBranch) @@ -174,7 +180,7 @@ get("/:owner/:repository/settings/branches/:branch")(ownerOnly { repository => import gitbucket.core.api._ val branch = params("branch") - if(repository.branchList.find(_ == branch).isEmpty){ + if(!repository.branchList.contains(branch)){ redirect(s"/${repository.owner}/${repository.name}/settings/branches") } else { val protection = ApiBranchProtection(getProtectedBranchInfo(repository.owner, repository.name, branch)) @@ -352,6 +358,12 @@ FileUtils.moveDirectory(dir, getLfsDir(form.newOwner, repository.name)) } } + // Move attached directory + defining(getAttachedDir(repository.owner, repository.name)){ dir => + if(dir.isDirectory) { + FileUtils.moveDirectory(dir, getAttachedDir(form.newOwner, repository.name)) + } + } // Delere parent directory FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name)) diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index 1b4ecc9..bd050ce 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,14 +18,12 @@ 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._ @@ -45,6 +43,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, @@ -71,6 +76,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())), @@ -173,10 +185,37 @@ 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) + None, JGitUtil.ContentInfo("text", None, None, Some("UTF-8")), protectedBranch) }) + 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) @@ -232,7 +271,7 @@ oldFileName = form.oldFileName, content = appendNewLine(convertLineSeparator(form.content, form.lineSeparator), form.lineSeparator), charset = form.charset, - message = if(form.oldFileName.exists(_ == 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}") @@ -547,6 +586,114 @@ } }) + 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) = { + + 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) => + 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,85 +744,15 @@ } } - 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.exists(_ == path) && !oldPath.exists(_ == 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) - val filename = repository.name + "-" + - (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + suffix - using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git => - val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision)) + val oid = git.getRepository.resolve(revision) + val revCommit = JGitUtil.getRevCommitFromId(git, oid) + val sha1 = oid.getName() + val repositorySuffix = (if(sha1.startsWith(revision)) sha1 else revision).replace('/','-') + val filename = repository.name + "-" + repositorySuffix + suffix contentType = "application/octet-stream" response.setHeader("Content-Disposition", s"attachment; filename=${filename}") @@ -683,6 +760,7 @@ git.archive .setFormat(suffix.tail) + .setPrefix(repository.name + "-" + repositorySuffix + "/") .setTree(revCommit) .setOutputStream(response.getOutputStream) .call() diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala index ac2fbff..9220853 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())), @@ -225,7 +225,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) } @@ -239,6 +239,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() @@ -272,18 +276,18 @@ } }.toList){ case (groupName, members) => getAccountByUserName(groupName, true).map { account => - updateGroup(groupName, form.url, form.description, form.isRemoved) + updateGroup(groupName, form.description, form.url, form.isRemoved) 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..b32deb0 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, WebHookEvent} 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/BasicTemplate.scala b/src/main/scala/gitbucket/core/model/BasicTemplate.scala index 4f93d3a..5608bbd 100644 --- a/src/main/scala/gitbucket/core/model/BasicTemplate.scala +++ b/src/main/scala/gitbucket/core/model/BasicTemplate.scala @@ -42,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/DeployKey.scala b/src/main/scala/gitbucket/core/model/DeployKey.scala index 4f34e45..71b80a2 100644 --- a/src/main/scala/gitbucket/core/model/DeployKey.scala +++ b/src/main/scala/gitbucket/core/model/DeployKey.scala @@ -1,13 +1,11 @@ package gitbucket.core.model -trait DeployKeyComponent { self: Profile => +trait DeployKeyComponent extends TemplateComponent { self: Profile => import profile.api._ lazy val DeployKeys = TableQuery[DeployKeys] - class DeployKeys(tag: Tag) extends Table[DeployKey](tag, "DEPLOY_KEY") { - val userName = column[String]("USER_NAME") - val repositoryName = column[String]("REPOSITORY_NAME") + class DeployKeys(tag: Tag) extends Table[DeployKey](tag, "DEPLOY_KEY") with BasicTemplate { val deployKeyId = column[Int]("DEPLOY_KEY_ID", O AutoInc) val title = column[String]("TITLE") val publicKey = column[String]("PUBLIC_KEY") 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/Milestone.scala b/src/main/scala/gitbucket/core/model/Milestone.scala index 81c4f2b..491fefd 100644 --- a/src/main/scala/gitbucket/core/model/Milestone.scala +++ b/src/main/scala/gitbucket/core/model/Milestone.scala @@ -9,10 +9,10 @@ class Milestones(tag: Tag) extends Table[Milestone](tag, "MILESTONE") with MilestoneTemplate { override val milestoneId = column[Int]("MILESTONE_ID", O AutoInc) val title = column[String]("TITLE") - val description = column[String]("DESCRIPTION") - val dueDate = column[java.util.Date]("DUE_DATE") - val closedDate = column[java.util.Date]("CLOSED_DATE") - def * = (userName, repositoryName, milestoneId, title, description.?, dueDate.?, closedDate.?) <> (Milestone.tupled, Milestone.unapply) + val description = column[Option[String]]("DESCRIPTION") + val dueDate = column[Option[java.util.Date]]("DUE_DATE") + val closedDate = column[Option[java.util.Date]]("CLOSED_DATE") + def * = (userName, repositoryName, milestoneId, title, description, dueDate, closedDate) <> (Milestone.tupled, Milestone.unapply) def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId) def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) = byMilestone(userName, repositoryName, milestoneId) 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 928d4e6..807456b 100644 --- a/src/main/scala/gitbucket/core/model/Profile.scala +++ b/src/main/scala/gitbucket/core/model/Profile.scala @@ -52,6 +52,7 @@ with IssueCommentComponent with IssueLabelComponent with LabelComponent + with PriorityComponent with MilestoneComponent with PullRequestComponent with RepositoryComponent 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 4367c68..3d2b51b 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 7ba1026..c87adbf 100644 --- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala +++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala @@ -2,10 +2,11 @@ import java.io.{File, FilenameFilter, InputStream} import java.net.URLClassLoader +import java.util.Base64 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.SystemSettings @@ -15,8 +16,8 @@ import io.github.gitbucket.solidbase.Solidbase import io.github.gitbucket.solidbase.manager.JDBCVersionManager import io.github.gitbucket.solidbase.model.Module -import org.apache.commons.codec.binary.{Base64, StringUtils} import org.slf4j.LoggerFactory +import play.twirl.api.Html import scala.collection.mutable import scala.collection.mutable.ListBuffer @@ -32,10 +33,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]] @@ -43,6 +51,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] @@ -54,7 +63,7 @@ def getPlugins(): List[PluginInfo] = plugins.toList def addImage(id: String, bytes: Array[Byte]): Unit = { - val encoded = StringUtils.newStringUtf8(Base64.encodeBase64(bytes, false)) + val encoded = Base64.getEncoder.encodeToString(bytes) images += ((id, encoded)) } @@ -83,7 +92,7 @@ def addRenderer(extension: String, renderer: Renderer): Unit = renderers += ((extension, renderer)) - def getRenderer(extension: String): Renderer = renderers.get(extension).getOrElse(DefaultRenderer) + def getRenderer(extension: String): Renderer = renderers.getOrElse(extension, DefaultRenderer) def renderableExtensions: Seq[String] = renderers.keys.toSeq @@ -99,6 +108,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 @@ -107,6 +120,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 @@ -135,6 +156,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 @@ -172,10 +197,10 @@ if(pluginDir.exists && pluginDir.isDirectory){ pluginDir.listFiles(new FilenameFilter { override def accept(dir: File, name: String): Boolean = name.endsWith(".jar") - }).foreach { pluginJar => + }).sortBy(_.getName).foreach { pluginJar => val classLoader = new URLClassLoader(Array(pluginJar.toURI.toURL), Thread.currentThread.getContextClassLoader) try { - val plugin = classLoader.loadClass("Plugin").newInstance().asInstanceOf[Plugin] + val plugin = classLoader.loadClass("Plugin").getDeclaredConstructor().newInstance().asInstanceOf[Plugin] // Migration val solidbase = new Solidbase() diff --git a/src/main/scala/gitbucket/core/service/AccountService.scala b/src/main/scala/gitbucket/core/service/AccountService.scala index 6a4b599..7c3b84c 100644 --- a/src/main/scala/gitbucket/core/service/AccountService.scala +++ b/src/main/scala/gitbucket/core/service/AccountService.scala @@ -166,8 +166,8 @@ def updateGroup(groupName: String, description: Option[String], url: Option[String], removed: Boolean)(implicit s: Session): Unit = Accounts.filter(_.userName === groupName.bind) - .map(t => (t.url.?, t.description.?, t.removed)) - .update(url, description, removed) + .map(t => (t.url.?, t.description.?, t.updatedDate, t.removed)) + .update(url, description, currentDate, removed) def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = { GroupMembers.filter(_.groupName === groupName.bind).delete 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 c6c4085..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 => @@ -111,7 +135,7 @@ val (_, cs) = status.head Some(CommitStatusInfo( count = status.length, - successCount = status.filter(_._2.state == CommitState.SUCCESS).length, + successCount = status.count(_._2.state == CommitState.SUCCESS), context = (if(status.length == 1) Some(cs.context) else None), state = (if(status.length == 1) Some(cs.state) else None), targetUrl = (if(status.length == 1) cs.targetUrl else None), @@ -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/MilestonesService.scala b/src/main/scala/gitbucket/core/service/MilestonesService.scala index 1e95856..276aa7c 100644 --- a/src/main/scala/gitbucket/core/service/MilestonesService.scala +++ b/src/main/scala/gitbucket/core/service/MilestonesService.scala @@ -21,7 +21,7 @@ def updateMilestone(milestone: Milestone)(implicit s: Session): Unit = Milestones .filter (t => t.byPrimaryKey(milestone.userName, milestone.repositoryName, milestone.milestoneId)) - .map (t => (t.title, t.description.?, t.dueDate.?, t.closedDate.?)) + .map (t => (t.title, t.description, t.dueDate, t.closedDate)) .update (milestone.title, milestone.description, milestone.dueDate, milestone.closedDate) def openMilestone(milestone: Milestone)(implicit s: Session): Unit = 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/ProtectedBranchService.scala b/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala index 577b843..d74280c 100644 --- a/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala +++ b/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala @@ -76,7 +76,7 @@ includeAdministrators: Boolean) extends AccountService with CommitStatusService { def isAdministrator(pusher: String)(implicit session: Session): Boolean = - pusher == owner || getGroupMembers(owner).filter(gm => gm.userName == pusher && gm.isManager).nonEmpty + pusher == owner || getGroupMembers(owner).exists(gm => gm.userName == pusher && gm.isManager) /** * Can't be force pushed diff --git a/src/main/scala/gitbucket/core/service/PullRequestService.scala b/src/main/scala/gitbucket/core/service/PullRequestService.scala index 3807e55..03f2e6e 100644 --- a/src/main/scala/gitbucket/core/service/PullRequestService.scala +++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala @@ -265,7 +265,7 @@ val summary = stateMap.map{ case (keyState, states) => states.size+" "+keyState.name }.mkString(", ") state -> summary } - lazy val statusesAndRequired:List[(CommitStatus, Boolean)] = statuses.map{ s => s -> branchProtection.contexts.exists(_==s.context) } + lazy val statusesAndRequired:List[(CommitStatus, Boolean)] = statuses.map{ s => s -> branchProtection.contexts.contains(s.context) } lazy val isAllSuccess = commitStateSummary._1==CommitState.SUCCESS } } 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 cdb2cde..a2fe53d 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala @@ -66,6 +66,7 @@ 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 @@ -73,6 +74,7 @@ val collaborators = Collaborators .filter(_.byRepository(oldUserName, oldRepositoryName)).list val protectedBranches = ProtectedBranches .filter(_.byRepository(oldUserName, oldRepositoryName)).list val protectedBranchContexts = ProtectedBranchContexts.filter(_.byRepository(oldUserName, oldRepositoryName)).list + val deployKeys = DeployKeys .filter(_.byRepository(oldUserName, oldRepositoryName)).list Repositories.filter { t => (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind) @@ -80,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. @@ -94,14 +96,19 @@ 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 } )} :_*) @@ -112,6 +119,7 @@ CommitStatuses .insertAll(commitStatuses.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) ProtectedBranches .insertAll(protectedBranches.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) ProtectedBranchContexts.insertAll(protectedBranchContexts.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + DeployKeys .insertAll(deployKeys .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) // Update source repository of pull requests PullRequests.filter { t => @@ -126,11 +134,6 @@ userName = newUserName, repositoryName = newRepositoryName )) :_*) - IssueLabels.insertAll(issueLabels.map(x => x.copy( - labelId = newLabelMap(oldLabelMap(x.labelId)), - userName = newUserName, - repositoryName = newRepositoryName - )) :_*) // TODO Drop transfered owner from collaborators? Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) @@ -164,10 +167,12 @@ 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 RepositoryWebHooks .filter(_.byRepository(userName, repositoryName)).delete RepositoryWebHookEvents .filter(_.byRepository(userName, repositoryName)).delete + DeployKeys .filter(_.byRepository(userName, repositoryName)).delete Repositories .filter(_.byRepository(userName, repositoryName)).delete // Update ORIGIN_USER_NAME and ORIGIN_REPOSITORY_NAME @@ -264,11 +269,19 @@ JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName) }, repository, - getForkedCount( - repository.originUserName.getOrElse(repository.userName), - repository.originRepositoryName.getOrElse(repository.repositoryName) - ), - getRepositoryManagers(repository.userName)) + if(withoutPhysicalInfo){ + -1 + } else { + getForkedCount( + repository.originUserName.getOrElse(repository.userName), + repository.originRepositoryName.getOrElse(repository.repositoryName) + ) + }, + if(withoutPhysicalInfo){ + Nil + } else { + getRepositoryManagers(repository.userName) + }) } } @@ -302,7 +315,7 @@ case None => Repositories filter(_.isPrivate === false.bind) }).filter { t => repositoryUserName.map { userName => t.userName === userName.bind } getOrElse LiteralColumn(true) - }.sortBy(_.lastActivityDate desc).list.map{ repository => + }.sortBy(_.lastActivityDate desc).list.map { repository => new RepositoryInfo( if(withoutPhysicalInfo){ new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName) @@ -310,11 +323,19 @@ JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName) }, repository, - getForkedCount( - repository.originUserName.getOrElse(repository.userName), - repository.originRepositoryName.getOrElse(repository.repositoryName) - ), - getRepositoryManagers(repository.userName)) + if(withoutPhysicalInfo){ + -1 + } else { + getForkedCount( + repository.originUserName.getOrElse(repository.userName), + repository.originRepositoryName.getOrElse(repository.repositoryName) + ) + }, + if(withoutPhysicalInfo) { + Nil + } else { + getRepositoryManagers(repository.userName) + }) } } diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala index f58fc55..e6bb4c1 100644 --- a/src/main/scala/gitbucket/core/service/WebHookService.scala +++ b/src/main/scala/gitbucket/core/service/WebHookService.scala @@ -8,7 +8,7 @@ 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 @@ -205,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{ @@ -223,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{ @@ -269,7 +269,7 @@ }).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) @@ -291,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{ @@ -330,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()) @@ -526,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/service/WikiService.scala b/src/main/scala/gitbucket/core/service/WikiService.scala index c5dad27..ab034fc 100644 --- a/src/main/scala/gitbucket/core/service/WikiService.scala +++ b/src/main/scala/gitbucket/core/service/WikiService.scala @@ -177,7 +177,7 @@ val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}") JGitUtil.processTree(git, headId){ (path, tree) => - if(revertInfo.find(x => x.filePath == path).isEmpty){ + if(!revertInfo.exists(x => x.filePath == path)){ builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId)) } } diff --git a/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala b/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala index 1136787..2947fde 100644 --- a/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala +++ b/src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala @@ -18,9 +18,9 @@ private val logger = LoggerFactory.getLogger(classOf[GitAuthenticationFilter]) def init(config: FilterConfig) = {} - + def destroy(): Unit = {} - + def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = { val request = req.asInstanceOf[HttpServletRequest] val response = res.asInstanceOf[HttpServletResponse] @@ -51,21 +51,21 @@ private def pluginRepository(request: HttpServletRequest, response: HttpServletResponse, chain: FilterChain, settings: SystemSettings, isUpdating: Boolean, filter: GitRepositoryFilter): Unit = { - implicit val r = request + Database() withSession { implicit session => + val account = for { + auth <- Option(request.getHeader("Authorization")) + Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2) + account <- authenticate(settings, username, password) + } yield { + request.setAttribute(Keys.Request.UserName, account.userName) + account + } - val account = for { - auth <- Option(request.getHeader("Authorization")) - Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2) - account <- authenticate(settings, username, password) - } yield { - request.setAttribute(Keys.Request.UserName, account.userName) - account - } - - if(filter.filter(request.gitRepositoryPath, account.map(_.userName), settings, isUpdating)){ - chain.doFilter(request, response) - } else { - AuthUtil.requireAuth(response) + if (filter.filter(request.gitRepositoryPath, account.map(_.userName), settings, isUpdating)) { + chain.doFilter(request, response) + } else { + AuthUtil.requireAuth(response) + } } } @@ -85,11 +85,16 @@ auth <- Option(request.getHeader("Authorization")) Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2) account <- authenticate(settings, username, password) - } yield if (isUpdating || repository.repository.isPrivate) { + } yield if (isUpdating) { if (hasDeveloperRole(repository.owner, repository.name, Some(account))) { request.setAttribute(Keys.Request.UserName, account.userName) true } else false + } else if(repository.repository.isPrivate){ + if (hasGuestRole(repository.owner, repository.name, Some(account))) { + request.setAttribute(Keys.Request.UserName, account.userName) + true + } else false } else true passed.getOrElse(false) } @@ -114,4 +119,4 @@ action() } -} \ No newline at end of file +} 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/PluginAssetsServlet.scala b/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala index 0d43af3..6fe1ed3 100644 --- a/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/PluginAssetsServlet.scala @@ -26,6 +26,7 @@ val bytes = IOUtils.toByteArray(in) resp.setContentLength(bytes.length) resp.setContentType(FileUtil.getContentType(path, bytes)) + resp.setHeader("Cache-Control", "max-age=3600") resp.getOutputStream.write(bytes) } finally { in.close() diff --git a/src/main/scala/gitbucket/core/ssh/GitCommand.scala b/src/main/scala/gitbucket/core/ssh/GitCommand.scala index 9461803..0629c14 100644 --- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala +++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala @@ -105,7 +105,7 @@ } } case AuthType.DeployKeyType(key) => { - getDeployKeys(owner, repoName).filter(sshKey => SshUtil.str2PublicKey(sshKey.publicKey).exists(_ == key)) match { + getDeployKeys(owner, repoName).filter(sshKey => SshUtil.str2PublicKey(sshKey.publicKey).contains(key)) match { case List(_) => true case _ => false } @@ -123,7 +123,7 @@ } } case AuthType.DeployKeyType(key) => { - getDeployKeys(owner, repoName).filter(sshKey => SshUtil.str2PublicKey(sshKey.publicKey).exists(_ == key)) match { + getDeployKeys(owner, repoName).filter(sshKey => SshUtil.str2PublicKey(sshKey.publicKey).contains(key)) match { case List(x) if x.allowWrite => true case _ => false } diff --git a/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala b/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala index 814e3e9..e3be40d 100644 --- a/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala +++ b/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala @@ -68,7 +68,7 @@ private def authenticateGenericUser(userName: String, key: PublicKey, session: ServerSession, genericUser: String)(implicit s: Session): Boolean = { // find all users having the key we got from ssh val possibleUserNames = getAllKeys().filter { sshKey => - SshUtil.str2PublicKey(sshKey.publicKey).exists(_ == key) + SshUtil.str2PublicKey(sshKey.publicKey).contains(key) }.map(_.userName).distinct // determine the user - if different accounts share the same key, tough luck @@ -85,7 +85,7 @@ }.getOrElse { // search deploy keys val existsDeployKey = getAllDeployKeys().exists { sshKey => - SshUtil.str2PublicKey(sshKey.publicKey).exists(_ == key) + SshUtil.str2PublicKey(sshKey.publicKey).contains(key) } if(existsDeployKey){ // found deploy key for repository diff --git a/src/main/scala/gitbucket/core/ssh/SshUtil.scala b/src/main/scala/gitbucket/core/ssh/SshUtil.scala index 42167ed..9563ab3 100644 --- a/src/main/scala/gitbucket/core/ssh/SshUtil.scala +++ b/src/main/scala/gitbucket/core/ssh/SshUtil.scala @@ -1,8 +1,8 @@ package gitbucket.core.ssh import java.security.PublicKey +import java.util.Base64 -import org.apache.commons.codec.binary.Base64 import org.apache.sshd.common.config.keys.KeyUtils import org.apache.sshd.common.util.buffer.ByteArrayBuffer import org.eclipse.jgit.lib.Constants @@ -18,16 +18,17 @@ val parts = key.split(" ") if (parts.size < 2) { logger.debug(s"Invalid PublicKey Format: ${key}") - return None - } - try { - val encodedKey = parts(1) - val decode = Base64.decodeBase64(Constants.encodeASCII(encodedKey)) - Some(new ByteArrayBuffer(decode).getRawPublicKey) - } catch { - case e: Throwable => - logger.debug(e.getMessage, e) - None + None + } else { + try { + val encodedKey = parts(1) + val decode = Base64.getDecoder.decode(Constants.encodeASCII(encodedKey)) + Some(new ByteArrayBuffer(decode).getRawPublicKey) + } catch { + case e: Throwable => + logger.debug(e.getMessage, e) + None + } } } diff --git a/src/main/scala/gitbucket/core/util/AuthUtil.scala b/src/main/scala/gitbucket/core/util/AuthUtil.scala index 7a83c13..5d937ca 100644 --- a/src/main/scala/gitbucket/core/util/AuthUtil.scala +++ b/src/main/scala/gitbucket/core/util/AuthUtil.scala @@ -1,5 +1,6 @@ package gitbucket.core.util +import java.util.Base64 import javax.servlet.http.HttpServletResponse /** @@ -13,9 +14,9 @@ def decodeAuthHeader(header: String): String = { try { - new String(new sun.misc.BASE64Decoder().decodeBuffer(header.substring(6))) + new String(Base64.getDecoder.decode(header.substring(6))) } catch { case _: Throwable => "" } } -} \ No newline at end of file +} diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index e15af9b..3c494ae 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -538,6 +538,7 @@ } else { // initial commit using(new TreeWalk(git.getRepository)){ treeWalk => + treeWalk.setRecursive(true) treeWalk.addTree(revCommit.getTree) val buffer = new scala.collection.mutable.ListBuffer[DiffInfo]() while(treeWalk.next){ @@ -951,7 +952,7 @@ * @return the last modified commit of specified path */ def getLastModifiedCommit(git: Git, startCommit: RevCommit, path: String): RevCommit = { - return git.log.add(startCommit).addPath(path).setMaxCount(1).call.iterator.next + git.log.add(startCommit).addPath(path).setMaxCount(1).call.iterator.next } def getBranches(owner: String, name: String, defaultBranch: String, origin: Boolean): Seq[BranchInfo] = { 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 587df35..908fd25 100644 --- a/src/main/scala/gitbucket/core/util/StringUtil.scala +++ b/src/main/scala/gitbucket/core/util/StringUtil.scala @@ -1,12 +1,12 @@ package gitbucket.core.util import java.net.{URLDecoder, URLEncoder} +import java.util.Base64 import org.mozilla.universalchardet.UniversalDetector import SyntaxSugars._ import org.apache.commons.io.input.BOMInputStream import org.apache.commons.io.IOUtils -import org.apache.commons.codec.binary.Base64 import scala.util.control.Exception._ @@ -34,14 +34,14 @@ val spec = new javax.crypto.spec.SecretKeySpec(BlowfishKey.getBytes(), "Blowfish") val cipher = javax.crypto.Cipher.getInstance("Blowfish") cipher.init(javax.crypto.Cipher.ENCRYPT_MODE, spec) - new String(Base64.encodeBase64(cipher.doFinal(value.getBytes("UTF-8"))), "UTF-8") + Base64.getEncoder.encodeToString(cipher.doFinal(value.getBytes("UTF-8"))) } def decodeBlowfish(value: String): String = { val spec = new javax.crypto.spec.SecretKeySpec(BlowfishKey.getBytes(), "Blowfish") val cipher = javax.crypto.Cipher.getInstance("Blowfish") cipher.init(javax.crypto.Cipher.DECRYPT_MODE, spec) - new String(cipher.doFinal(Base64.decodeBase64(value)), "UTF-8") + new String(cipher.doFinal(Base64.getDecoder.decode(value)), "UTF-8") } def urlEncode(value: String): String = URLEncoder.encode(value, "UTF-8").replace("+", "%20") @@ -136,6 +136,4 @@ // } // b.toString // } - - } diff --git a/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala b/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala new file mode 100644 index 0000000..48c0317 --- /dev/null +++ b/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala @@ -0,0 +1,127 @@ +package gitbucket.core.util + +import java.io.ByteArrayOutputStream +import java.awt.image.BufferedImage +import javax.imageio.ImageIO +import java.awt.{Color, Font, Graphics2D, RenderingHints} +import java.awt.font.{FontRenderContext, TextLayout} +import java.awt.geom.AffineTransform + + +object TextAvatarUtil { + private val iconSize = 200 + private val fontSize = 180 + private val roundSize = 60 + private val shadowSize = 20 + private val bgSaturation = 0.68f + private val bgBlightness = 0.73f + private val shadowBlightness = 0.23f + private val font = new Font(Font.SANS_SERIF, Font.PLAIN, fontSize) + private val transparent = new Color(0, 0, 0, 0) + + // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef + private def relativeLuminance(c: Color): Double = { + val rgb = Seq(c.getRed, c.getGreen, c.getBlue).map{_/255.0}.map{x => if (x <= 0.03928) x / 12.92 else math.pow((x + 0.055) / 1.055, 2.4)} + 0.2126 * rgb(0) + 0.7152 * rgb(1) + 0.0722 * rgb(2) + } + + // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef + private def contrastRatio(c1: Color, c2: Color): Double = { + val l1 = relativeLuminance(c1) + val l2 = relativeLuminance(c2) + if (l1 > l2) (l1 + 0.05) / (l2 + 0.05) else (l2 + 0.05) / (l1 + 0.05) + } + + private def goodContrastColor(base: Color, c1: Color, c2: Color): Color = { + if (contrastRatio(base, c1) > contrastRatio(base, c2)) c1 else c2 + } + + private def strToHue(text: String): Float = { + Integer.parseInt(StringUtil.md5(text).substring(0, 2), 16) / 256f + } + + private def getCenterToDraw(drawText: String, font: Font, w: Int, h: Int): (Int, Int) = { + val context = new FontRenderContext(new AffineTransform(), true, true) + val txt = new TextLayout(drawText, font, context) + + val bounds = txt.getBounds + + val x: Int = ((w - bounds.getWidth) / 2 - bounds.getX).toInt + val y: Int = ((h - bounds.getHeight) / 2 - bounds.getY).toInt + (x, y) + } + + private def textImage(drawText: String, bgColor: Color, fgColor: Color): Array[Byte] = { + val canvas = new BufferedImage(iconSize, iconSize, BufferedImage.TYPE_INT_ARGB) + val g = canvas.createGraphics() + val center = getCenterToDraw(drawText, font, iconSize, iconSize) + + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON) + + g.setColor(transparent) + g.fillRect(0, 0, iconSize, iconSize) + + g.setColor(bgColor) + g.fillRoundRect(0, 0, iconSize, iconSize, roundSize, roundSize) + + g.setColor(fgColor) + g.setFont(font) + g.drawString(drawText, center._1, center._2) + + g.dispose() + + val stream = new ByteArrayOutputStream + ImageIO.write(canvas, "png", stream) + stream.toByteArray + } + + def textAvatar(nameText: String): Option[Array[Byte]] = { + val drawText = nameText.substring(0, 1) + + val bgHue = strToHue(nameText) + val bgColor = Color.getHSBColor(bgHue, bgSaturation, bgBlightness) + val fgColor = goodContrastColor(bgColor, Color.BLACK, Color.WHITE) + + val font = new Font(Font.SANS_SERIF, Font.PLAIN, fontSize) + if (font.canDisplayUpTo(drawText) == -1) Some(textImage(drawText, bgColor, fgColor)) else None + } + + private def textGroupImage(drawText: String, bgColor: Color, fgColor: Color, shadowColor: Color): Array[Byte] = { + val canvas = new BufferedImage(iconSize, iconSize, BufferedImage.TYPE_INT_ARGB) + val g = canvas.createGraphics() + val center = getCenterToDraw(drawText, font, iconSize - shadowSize, iconSize - shadowSize) + + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON) + + g.setColor(transparent) + g.fillRect(0, 0, iconSize, iconSize) + + g.setColor(shadowColor) + g.fillRect(shadowSize, shadowSize, iconSize, iconSize) + + g.setColor(bgColor) + g.fillRect(0, 0, iconSize - shadowSize, iconSize - shadowSize) + + g.setColor(fgColor) + + g.setFont(font) + g.drawString(drawText, center._1, center._2) + + g.dispose() + + val stream = new ByteArrayOutputStream + ImageIO.write(canvas, "png", stream) + stream.toByteArray + } + + def textGroupAvatar(nameText: String): Option[Array[Byte]] = { + val drawText = nameText.substring(0, 1) + + val bgHue = strToHue(nameText) + val bgColor = Color.getHSBColor(bgHue, bgSaturation, bgBlightness) + val fgColor = goodContrastColor(bgColor, Color.BLACK, Color.WHITE) + val shadowColor = Color.getHSBColor(bgHue, bgSaturation, shadowBlightness) + + if (font.canDisplayUpTo(drawText) == -1) Some(textGroupImage(drawText, bgColor, fgColor, shadowColor)) else None + } +} 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/AvatarImageProvider.scala b/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala index 8d316ab..8cd64d0 100644 --- a/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala +++ b/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala @@ -20,7 +20,7 @@ if(account.image.isEmpty && context.settings.gravatar){ s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g""" } else { - s"""${context.path}/${account.userName}/_avatar""" + s"""${context.path}/${account.userName}/_avatar?${helpers.hashDate(account.updatedDate)}""" } } getOrElse { s"""${context.path}/_unknown/_avatar""" @@ -31,7 +31,7 @@ if(account.image.isEmpty && context.settings.gravatar){ s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g""" } else { - s"""${context.path}/${account.userName}/_avatar""" + s"""${context.path}/${account.userName}/_avatar?${helpers.hashDate(account.updatedDate)}""" } } getOrElse { if(context.settings.gravatar){ @@ -49,4 +49,4 @@ } } -} \ No newline at end of file +} diff --git a/src/main/scala/gitbucket/core/view/Markdown.scala b/src/main/scala/gitbucket/core/view/Markdown.scala index 4b36da3..a4d05b6 100644 --- a/src/main/scala/gitbucket/core/view/Markdown.scala +++ b/src/main/scala/gitbucket/core/view/Markdown.scala @@ -38,13 +38,11 @@ val source = if(enableTaskList) escapeTaskList(markdown) else markdown val options = new Options() - options.setSanitize(true) options.setBreaks(enableLineBreaks) val renderer = new GitBucketMarkedRenderer(options, repository, enableWikiLink, enableRefsLink, enableAnchor, enableTaskList, hasWritePermission, pages) - //helpers.decorateHtml(Marked.marked(source, options, renderer), repository) Marked.marked(source, options, renderer) } diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala index dc4e1c1..b308c5f 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -75,6 +75,21 @@ def date(date: Date): String = new SimpleDateFormat("yyyy-MM-dd").format(date) /** + * Format java.util.Date to "yyyyMMDDHHmmss" (for url hash ex. /some/path.css?19800101010203 + */ + def hashDate(date: Date): String = new SimpleDateFormat("yyyyMMddHHmmss").format(date) + + /** + * java.util.Date of boot timestamp. + */ + val bootDate: Date = new Date() + + /** + * hashDate of bootDate for /assets, /plugin-assets + */ + def hashQuery: String = hashDate(bootDate) + + /** * Returns singular if count is 1, otherwise plural. * If plural is not specified, returns singular + "s" as plural. */ @@ -209,9 +224,15 @@ /** * Returns the url to the root of assets. */ + @deprecated("Use assets(path: String)(implicit context: Context) instead.", "4.11.0") def assets(implicit context: Context): String = s"${context.path}/assets" /** + * Returns the url to the path of assets. + */ + def assets(path: String)(implicit context: Context): String = s"${context.path}/assets${path}?${hashQuery}" + + /** * Generates the text link to the account page. * If user does not exist or disabled, this method returns user name as text without link. */ @@ -344,6 +365,10 @@ decorateHtml(HtmlFormat.fill(out).toString, repository) } + /** + * Decorate a given HTML by TextDecorators which are provided by plug-ins. + * TextDecorators are applied to only text parts of a given HTML. + */ def decorateHtml(html: String, repository: RepositoryInfo)(implicit context: Context): String = { PluginRegistry().getTextDecorators.foldLeft(html){ case (html, decorator) => val text = new StringBuilder() diff --git a/src/main/twirl/gitbucket/core/account/activity.scala.html b/src/main/twirl/gitbucket/core/account/activity.scala.html index ed986ef..e3b1307 100644 --- a/src/main/twirl/gitbucket/core/account/activity.scala.html +++ b/src/main/twirl/gitbucket/core/account/activity.scala.html @@ -4,7 +4,7 @@ @import gitbucket.core.view.helpers @gitbucket.core.account.html.main(account, groupNames, "activity"){
- activities + activities
@gitbucket.core.helper.html.activities(activities) } diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html index a065e66..0bd5f99 100644 --- a/src/main/twirl/gitbucket/core/account/application.scala.html +++ b/src/main/twirl/gitbucket/core/account/application.scala.html @@ -2,7 +2,6 @@ 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){
Personal access tokens
@@ -49,5 +48,4 @@
} -
} diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html index 757e068..9237745 100644 --- a/src/main/twirl/gitbucket/core/account/edit.scala.html +++ b/src/main/twirl/gitbucket/core/account/edit.scala.html @@ -2,7 +2,6 @@ @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.helper.html.information(info) @gitbucket.core.helper.html.error(error) @@ -61,7 +60,6 @@
} - } - + + -} \ 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 59f0ec3..4ec4b09 100644 --- a/src/main/twirl/gitbucket/core/helper/preview.scala.html +++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html @@ -38,16 +38,17 @@ - - + + } diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html index fb0ec7e..9ed5013 100644 --- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html +++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html @@ -6,6 +6,7 @@ condition: gitbucket.core.service.IssuesService.IssueSearchCondition, collaborators: List[String] = Nil, milestones: List[gitbucket.core.model.Milestone] = Nil, + priorities: List[gitbucket.core.model.Priority] = Nil, labels: List[gitbucket.core.model.Label] = Nil, repository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo] = None, isManageable: Boolean = false)(implicit context: gitbucket.core.controller.Context) @@ -27,7 +28,7 @@ - @gitbucket.core.helper.html.dropdown("Author") { + @gitbucket.core.helper.html.dropdown("Author", filter = ("author", "Find Author...")) { @collaborators.map { collaborator =>
  • @@ -37,7 +38,7 @@
    • } } - @gitbucket.core.helper.html.dropdown("Label") { + @gitbucket.core.helper.html.dropdown("Label", filter = ("label", "Find Label...")) { @labels.map { label =>
  • @@ -48,7 +49,23 @@
    • } } - @gitbucket.core.helper.html.dropdown("Milestone") { + @gitbucket.core.helper.html.dropdown("Priority", filter = ("priority", "Find Priority...")) { +
  • + + @gitbucket.core.helper.html.checkicon(condition.priority == Some(None)) Issues with no priority + +
    • + @priorities.map { priority => +
  • + + @gitbucket.core.helper.html.checkicon(condition.priority == Some(Some(priority.priorityName))) +    + @priority.priorityName + +
    • + } + } + @gitbucket.core.helper.html.dropdown("Milestone", filter = ("milestone", "Find Milestone...")) {
  • @gitbucket.core.helper.html.checkicon(condition.milestone == Some(None)) Issues with no milestone @@ -62,7 +79,7 @@
    • } } - @gitbucket.core.helper.html.dropdown("Assignee") { + @gitbucket.core.helper.html.dropdown("Assignee", filter = ("assignee", "Find Assignee...")) {
  • @gitbucket.core.helper.html.checkicon(condition.assigned == Some(None)) Assigned to nobody @@ -89,6 +106,16 @@
  • + + @gitbucket.core.helper.html.checkicon(condition.sort == "priority" && condition.direction == "asc") Highest priority + +
    • +
  • + + @gitbucket.core.helper.html.checkicon(condition.sort == "priority" && condition.direction == "desc") Lowest priority + +
    • +
  • @gitbucket.core.helper.html.checkicon(condition.sort == "comments" && condition.direction == "desc") Most commented @@ -116,7 +143,7 @@
  • Open
  • Close
    • } - @gitbucket.core.helper.html.dropdown("Label") { + @gitbucket.core.helper.html.dropdown("Label", filter = ("label", "Find Label...")) { @labels.map { label =>
  • @@ -127,13 +154,21 @@
    • } } - @gitbucket.core.helper.html.dropdown("Milestone") { + @gitbucket.core.helper.html.dropdown("Priority", filter = ("priority", "Find Priority...")) { +
  • No priority
    • + @priorities.map { priority => +
  • +   + @priority.priorityName
    • + } + } + @gitbucket.core.helper.html.dropdown("Milestone", filter = ("milestone", "Find Milestone...")) {
  • No milestone
    • @milestones.filter(_.closedDate.isEmpty).map { milestone =>
  • @milestone.title
    • } } - @gitbucket.core.helper.html.dropdown("Assignee") { + @gitbucket.core.helper.html.dropdown("Assignee", filter = ("assignee", "Find Assignee...")) {
  • Clear assignee
    • @collaborators.map { collaborator =>
  • @helpers.avatar(collaborator, 20) @collaborator
    • @@ -171,7 +206,7 @@ } - @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){ +
    + New priority +
    + } + + + + + + + + + + + @priorities.map { priority => + @gitbucket.core.issues.priorities.html.priority(priority, counts, repository, hasWritePermission) + } + + + + +
    + @priorities.size priorities +
    + } +} + 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.priorityName + + +
    +
    +
    + @priority.description.getOrElse("") +
    +
    +
    + @if(hasWritePermission){ + + } else if(priority.isDefault) { + + } +
    +
    +
    +
    + @counts.get(priority.priorityName).getOrElse(0) open issues +
    +
    + @if(hasWritePermission){ +
    +
    + Edit +    + Delete +
    +
    + } +
    + + diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html index a5d792a..c252432 100644 --- a/src/main/twirl/gitbucket/core/main.scala.html +++ b/src/main/twirl/gitbucket/core/main.scala.html @@ -7,42 +7,46 @@ @title - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @repository.map { repository => } - + - +
    @@ -72,26 +76,34 @@
      @if(context.loginAccount.isDefined){ -
    • +
    • -
        -
      • New repository
        • -
      • New group
        • + -
      • +
      • @helpers.avatar(context.loginAccount.get.userName, 16) -
          -
        • Your profile
          • -
        • Account settings
          • - @if(context.loginAccount.get.isAdmin){ -
        • System administration
          • - } -
        • Sign out
          • + } else { diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index e75d7f8..c6f5f70 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -6,83 +6,91 @@ @import gitbucket.core.view.helpers @menuitem(path: String, name: String, label: String, icon: String, count: Int = 0) = { -
        • +
        • @if(path.startsWith("http")){ - @label @if(count > 0) { @count } + + @label + @if(count > 0){ + @count + } } else { - @label @if(count > 0) { @count } + + @label + @if(count > 0) { + @count + } }
          • } -
          -
          -
            - @menuitem("", "files", "Files", "code") - @if(repository.branchList.nonEmpty) { - @menuitem("/branches", "branches", "Branches", "git-branch", repository.branchList.length) - @menuitem("/tags", "tags", "Tags", "tag", repository.tags.length) +
            +
            +
              + @menuitem("", "files", "Files", "code") + @if(repository.branchList.nonEmpty) { + @menuitem("/branches", "branches", "Branches", "git-branch", repository.branchList.length) + @menuitem("/tags", "tags", "Tags", "tag", repository.tags.length) + } + @if(repository.repository.options.issuesOption != "DISABLE") { + @menuitem("/issues", "issues", "Issues", "issue-opened", repository.issueCount) + @menuitem("/pulls", "pulls", "Pull requests", "git-pull-request", repository.pullCount) + @menuitem("/issues/labels", "labels", "Labels", "tag") + @menuitem("/issues/priorities", "priorities", "Priorities", "flame") + @menuitem("/issues/milestones", "milestones", "Milestones", "milestone") + } else { + @repository.repository.options.externalIssuesUrl.map { externalIssuesUrl => + @menuitem(externalIssuesUrl, "issues", "Issues", "issue-opened") } - @if(repository.repository.options.issuesOption != "DISABLE") { - @menuitem("/issues", "issues", "Issues", "issue-opened", repository.issueCount) - @menuitem("/pulls", "pulls", "Pull requests", "git-pull-request", repository.pullCount) - @menuitem("/issues/labels", "labels", "Labels", "tag") - @menuitem("/issues/milestones", "milestones", "Milestones", "milestone") - } else { - @repository.repository.options.externalIssuesUrl.map { externalIssuesUrl => - @menuitem(externalIssuesUrl, "issues", "Issues", "issue-opened") - } + } + @if(repository.repository.options.wikiOption != "DISABLE") { + @menuitem("/wiki", "wiki", "Wiki", "book") + } else { + @repository.repository.options.externalWikiUrl.map { externalWikiUrl => + @menuitem(externalWikiUrl, "wiki", "Wiki", "book") } - @if(repository.repository.options.wikiOption != "DISABLE") { - @menuitem("/wiki", "wiki", "Wiki", "book") - } else { - @repository.repository.options.externalWikiUrl.map { externalWikiUrl => - @menuitem(externalWikiUrl, "wiki", "Wiki", "book") - } + } + @if(repository.repository.options.allowFork) { + @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount) + } + @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){ + @menuitem("/settings", "settings", "Settings", "tools") + } + @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu => + @menu(repository, context).map { link => + @menuitem(link.path, link.id, link.label, link.icon.getOrElse("ruby")) } - @if(repository.repository.options.allowFork) { - @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount) - } - @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){ - @menuitem("/settings", "settings", "Settings", "tools") - } - @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu => - @menu(repository, context).map { link => - @menuitem(link.path, link.id, link.label, link.icon.getOrElse("ruby")) - } - } -
            -
            + } +
          -
          -
          -
          -
          - @gitbucket.core.helper.html.information(info) - @gitbucket.core.helper.html.error(error) -
          - @gitbucket.core.helper.html.repositoryicon(repository, true) - @repository.owner / @repository.name +
          +
          +
          +
          +
          + @gitbucket.core.helper.html.information(info) + @gitbucket.core.helper.html.error(error) +
          + @gitbucket.core.helper.html.repositoryicon(repository, true) + @repository.owner / @repository.name - @defining(repository.repository){ x => - @if(repository.repository.originRepositoryName.isDefined){ -
          - forked from @x.parentUserName/@x.parentRepositoryName -
          - } - @x.description.map { description => -
          @Html(helpers.detectAndRenderLinks(description, repository))
          - } + @defining(repository.repository){ x => + @if(repository.repository.originRepositoryName.isDefined){ +
          + forked from @x.parentUserName/@x.parentRepositoryName +
          } -
          + @x.description.map { description => +
          @Html(helpers.detectAndRenderLinks(description, repository))
          + } + }
          - @body
          + @body
          diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index d97b36f..ea09ab7 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -14,36 +14,37 @@ hasOriginWritePermission: Boolean, collaborators: List[String], milestones: List[gitbucket.core.model.Milestone], + priorities: List[gitbucket.core.model.Priority], labels: List[gitbucket.core.model.Label])(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers @gitbucket.core.html.main(s"Pull requests - ${repository.owner}/${repository.name}", Some(repository)){ @gitbucket.core.html.menu("pulls", repository){
          - @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork") { + @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork", filter=("origin_repo", "Find Repository...")) { @members.map { case (owner, name) =>
        • @gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name
          • } } - @gitbucket.core.helper.html.dropdown(originId, "base") { + @gitbucket.core.helper.html.dropdown(originId, "base", filter=("origin_branch", "Find Branch...")) { @originRepository.branchList.map { branch =>
        • @gitbucket.core.helper.html.checkicon(branch == originId) @branch
          • } } ... - @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork") { + @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork", filter=("forked_repo", "Find Repository...")) { @members.map { case (owner, name) =>
        • @gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name
          • } } - @gitbucket.core.helper.html.dropdown(forkedId, "compare") { + @gitbucket.core.helper.html.dropdown(forkedId, "compare", filter=("forked_branch", "Find Branch...")) { @forkedRepository.branchList.map { branch =>
        • @gitbucket.core.helper.html.checkicon(branch == forkedId) @branch
          • } }
          @if(commits.nonEmpty && context.loginAccount.isDefined){ @@ -81,7 +82,7 @@
          - @gitbucket.core.issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map((_, 0, 0)), labels, hasOriginWritePermission, repository) + @gitbucket.core.issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map((_, 0, 0)), priorities, None, labels, hasOriginWritePermission, repository)
          diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html index 85e862c..9ac8954 100644 --- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html @@ -1,13 +1,17 @@ @(issue: gitbucket.core.model.Issue, pullreq: gitbucket.core.model.PullRequest, + commits: Seq[gitbucket.core.util.JGitUtil.CommitInfo], comments: List[gitbucket.core.model.Comment], 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, - repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) + isManageableForkedRepository: Boolean, + repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers
          @@ -21,16 +25,16 @@ } - @if(isManageable && issue.closed && pullreq.userName == pullreq.requestUserName && merged && - pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){ + @if(isManageableForkedRepository && issue.closed && merged && + forkedRepository.map(r => (r.branchList.contains(pullreq.requestBranch) && r.repository.defaultBranch != pullreq.requestBranch)).getOrElse(false)){
          - Delete branch + Delete branch
          Pull request successfully merged and closed
          @@ -42,25 +46,19 @@ }
          - @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)
          \ No newline at end of file + diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html index 7a10072..d8713e0 100644 --- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html @@ -112,20 +112,19 @@

          Step 1: From your project repository, check out a new branch and test the changes.

          - @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}\n" + - s"git pull ${forkedRepository.httpUrl} ${pullreq.requestBranch}"){ command => - @gitbucket.core.helper.html.copy("merge-command", "merge-command-copy-1", command, "position: absolute; right: 31px;")() - 
          @Html(command)
          + @helpers.pre { + git checkout -b @{pullreq.requestUserName}-@{pullreq.requestBranch} @{pullreq.branch} + git pull @{forkedRepository.httpUrl} @{pullreq.requestBranch} }

          Step 2: Merge the changes and update on the server.

          - @defining(s"git checkout ${pullreq.branch}\ngit merge --no-ff ${pullreq.requestUserName}-${pullreq.requestBranch}\n" + - s"git push origin ${pullreq.branch}"){ command => - @gitbucket.core.helper.html.copy("merge-command-2", "merge-command-copy-2", command, "position: absolute; right: 31px;")() - 
          @command
          + @helpers.pre { + git checkout @{pullreq.branch} + git merge --no-ff @{pullreq.requestUserName}-@{pullreq.requestBranch} + git push origin @{pullreq.branch} }
          diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html index e605677..9c2c229 100644 --- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html @@ -4,12 +4,15 @@ 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], dayByDayCommits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]], diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo], isEditable: Boolean, isManageable: Boolean, + isManageableForkedRepository: Boolean, repository: gitbucket.core.service.RepositoryService.RepositoryInfo, + forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo], flash: Map[String, String])(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers @import gitbucket.core.model.IssueComment @@ -83,13 +86,17 @@ @flash.get("info").map{ info =>
          @info
          } - @gitbucket.core.pulls.html.conversation(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, isEditable, isManageable, repository) + @gitbucket.core.pulls.html.conversation(issue, pullreq, commits, comments, issueLabels, collaborators, milestones, priorities, labels, isEditable, isManageable, isManageableForkedRepository, repository, forkedRepository)
          - @gitbucket.core.pulls.html.commits(dayByDayCommits, Some(comments), repository) + @if(commits.nonEmpty){ + @gitbucket.core.pulls.html.commits(dayByDayCommits, Some(comments), repository) + }
          - @gitbucket.core.helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true, Some(pullreq.issueId), isManageable, true) + @if(commits.nonEmpty){ + @gitbucket.core.helper.html.diff(diffs, repository, commits.headOption.map(_.id), commits.lastOption.map(_.id), true, Some(pullreq.issueId), isManageable, true) + }
          } @@ -149,4 +156,4 @@ return false; }); }); - \ No newline at end of file + diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html index a9318d4..65bf985 100644 --- a/src/main/twirl/gitbucket/core/repo/branches.scala.html +++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html @@ -23,7 +23,7 @@ - @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/delete.scala.html b/src/main/twirl/gitbucket/core/repo/delete.scala.html index 57190ab..fc7e771 100644 --- a/src/main/twirl/gitbucket/core/repo/delete.scala.html +++ b/src/main/twirl/gitbucket/core/repo/delete.scala.html @@ -50,10 +50,10 @@ } } - - + + \ No newline at end of file + diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html index cafbd29..2bb438d 100644 --- a/src/main/twirl/gitbucket/core/repo/editor.scala.html +++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html @@ -46,7 +46,6 @@ -
          @helpers.avatarLink(context.loginAccount.get.userName, 48)
          @@ -72,9 +71,9 @@ } } - - - + + + diff --git a/src/main/twirl/gitbucket/core/settings/branches.scala.html b/src/main/twirl/gitbucket/core/settings/branches.scala.html index 75331a1..69c3e19 100644 --- a/src/main/twirl/gitbucket/core/settings/branches.scala.html +++ b/src/main/twirl/gitbucket/core/settings/branches.scala.html @@ -46,14 +46,12 @@

          - +
          @protectedBranchList.map { branch => } @@ -64,4 +62,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html index 9fb7137..5bd5413 100644 --- a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html +++ b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html @@ -33,30 +33,30 @@ Sorry, we couldn’t find any status checks in the last week for this repository.
          Please create a commit status by API (Learn more about status checks on GitHub) - }else{ -
          @branch - - Edit - + Edit