Browse code Merge branch 'master' into new-plugin-system Conflicts: src/main/scala/servlet/AutoUpdateListener.scala master
commit ab564cc2d47847ecb1d8d8c9651c0effa28761c1 2 parents b10839a + bb3323f Naoki Takezoe authored on 14 Feb 2015

Showing 12 changed files

• project/build.scala
• src/main/resources/database.conf
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/scala/servlet/TransactionFilter.scala
• src/main/scala/ssh/GitCommand.scala
• src/main/scala/ssh/PublicKeyAuthenticator.scala
• src/main/scala/util/DatabaseConfig.scala
• src/main/scala/util/Notifier.scala
• src/main/twirl/menu.scala.html
• src/main/webapp/WEB-INF/web.xml
• src/main/webapp/assets/common/js/gitbucket.js
• src/test/scala/service/ServiceSpecBase.scala

Ignore Space Show notes View project/build.scala

Ignore Space Show notes View src/main/resources/database.conf 0 → 100644

Ignore Space Show notes View src/main/scala/servlet/AutoUpdateListener.scala

Ignore Space Show notes View src/main/scala/servlet/TransactionFilter.scala

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

Ignore Space Show notes View src/main/scala/ssh/PublicKeyAuthenticator.scala

Ignore Space Show notes View src/main/scala/util/DatabaseConfig.scala 0 → 100644

Ignore Space Show notes View src/main/scala/util/Notifier.scala

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

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

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

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

Show line notes below