Browse code Merge branch 'master' Conflicts: project/build.scala master
commit 40e36e3f8bb9e279cc9df75fe0c21a19a90b60ce 2 parents 3d1c9bc + df06f50 Naoki Takezoe authored on 27 Jan 2016

Showing 34 changed files

• build.sbt
• doc/release.md
• embed-jetty/javax.servlet-3.0.0.v201112011016.jar
• embed-jetty/javax.servlet-api-3.1.0.jar
• embed-jetty/jetty-continuation-9.3.6.v20151106.jar
• embed-jetty/jetty-http-9.3.6.v20151106.jar
• embed-jetty/jetty-io-9.3.6.v20151106.jar
• embed-jetty/jetty-security-9.3.6.v20151106.jar
• embed-jetty/jetty-server-9.3.6.v20151106.jar
• embed-jetty/jetty-servlet-9.3.6.v20151106.jar
• embed-jetty/jetty-util-9.3.6.v20151106.jar
• embed-jetty/jetty-webapp-9.3.6.v20151106.jar
• embed-jetty/jetty-xml-9.3.6.v20151106.jar
• embed-jetty/update.sh
• project/build.scala
• release/build.xml
• release/make-release-war.sh
• src/main/scala/gitbucket/core/api/ApiLabel.scala
• src/main/scala/gitbucket/core/api/CreateALabel.scala
• src/main/scala/gitbucket/core/api/JsonFormat.scala
• src/main/scala/gitbucket/core/controller/LabelsController.scala
• src/main/scala/gitbucket/core/model/BasicTemplate.scala
• src/main/scala/gitbucket/core/model/Labels.scala
• src/main/scala/gitbucket/core/service/LabelsService.scala
• src/main/scala/gitbucket/core/ssh/GitCommand.scala
• src/main/scala/gitbucket/core/util/RepoitoryName.scala
• src/main/scala/gitbucket/core/util/RepositoryName.scala
• src/main/scala/gitbucket/core/view/Markdown.scala
• src/main/twirl/gitbucket/core/main.scala.html
• src/main/webapp/assets/common/css/gitbucket.css
• src/main/webapp/assets/common/js/gitbucket.js
• src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
• src/test/scala/gitbucket/core/service/LabelsServiceSpec.scala
• src/test/scala/gitbucket/core/service/ServiceSpecBase.scala

Ignore Space Show notes View build.sbt 0 → 100644

Ignore Space Show notes View doc/release.md

Show notes View embed-jetty/javax.servlet-3.0.0.v201112011016.jar 100644 → 0
Not supported

Show notes View embed-jetty/javax.servlet-api-3.1.0.jar 100644 → 0
Not supported

Show notes View embed-jetty/jetty-continuation-9.3.6.v20151106.jar 100644 → 0
Not supported

Show notes View embed-jetty/jetty-http-9.3.6.v20151106.jar 100644 → 0
Not supported

Show notes View embed-jetty/jetty-io-9.3.6.v20151106.jar 100644 → 0
Not supported

Show notes View embed-jetty/jetty-security-9.3.6.v20151106.jar 100644 → 0
Not supported

Show notes View embed-jetty/jetty-server-9.3.6.v20151106.jar 100644 → 0
Not supported

Show notes View embed-jetty/jetty-servlet-9.3.6.v20151106.jar 100644 → 0
Not supported

Show notes View embed-jetty/jetty-util-9.3.6.v20151106.jar 100644 → 0
Not supported

Show notes View embed-jetty/jetty-webapp-9.3.6.v20151106.jar 100644 → 0
Not supported

Show notes View embed-jetty/jetty-xml-9.3.6.v20151106.jar 100644 → 0
Not supported

Show notes View embed-jetty/update.sh 100755 → 0

Show notes View project/build.scala 100644 → 0

Show notes View release/build.xml 100644 → 0

Show notes View release/make-release-war.sh 100755 → 0

Ignore Space Show notes View src/main/scala/gitbucket/core/api/ApiLabel.scala 0 → 100644

Ignore Space Show notes View src/main/scala/gitbucket/core/api/CreateALabel.scala 0 → 100644

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

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

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

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

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

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

Show notes View src/main/scala/gitbucket/core/util/RepoitoryName.scala 100644 → 0

Ignore Space Show notes View src/main/scala/gitbucket/core/util/RepositoryName.scala 0 → 100644

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

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

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

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

Ignore Space Show notes View src/test/scala/gitbucket/core/api/JsonFormatSpec.scala

Ignore Space Show notes View src/test/scala/gitbucket/core/service/LabelsServiceSpec.scala 0 → 100644

Ignore Space Show notes View src/test/scala/gitbucket/core/service/ServiceSpecBase.scala

Show line notes below