126 Commits

Author	SHA1	Message	Date
Naoki Takezoe	f2750c20a2	Merge branch 'solidbase-integration' into switch_slick_driver	2016-04-12 01:10:23 +09:00
Naoki Takezoe	2da2b426a1	Merge branch 'master' into solidbase-integration ... # Conflicts: # build.sbt # src/main/twirl/gitbucket/core/main.scala.html	2016-04-12 01:08:59 +09:00
Naoki Takezoe	5a0bc127b7	Add MySQL jdbc driver	2016-04-12 01:06:12 +09:00
Naoki Takezoe	23a482bbba	Use HikariCP instead of c3p0	2016-04-11 22:16:41 +09:00
Naoki Takezoe	1968bf871a	Update version to 3.14.0-SNAPSHOT	2016-04-03 00:44:19 +09:00
Naoki Takezoe	5aa6f5bce3	Update GitBucketVersion to 3.13	2016-04-01 02:00:11 +09:00
xuwei-k	2bcab30529	update Scala 2.11.8, use new Java8 Backend ... - https://github.com/scala/make-release-notes/blob/9cfbdc8c92f94/experimental-backend.md#emitting-java-8-style-lambdas - http://d.hatena.ne.jp/xuwei/20150626/1435282696	2016-03-10 14:07:48 +09:00
Naoki Takezoe	ea7c8e62de	Bump markedj to 1.0.7	2016-03-10 01:40:49 +09:00
Naoki Takezoe	43097b4c1c	Restore amateras-snapshot repository setting	2016-03-06 13:07:43 +09:00
Naoki Takezoe	539751a1d9	Merge branch 'master' into solidbase-integration ... # Conflicts: # build.sbt # src/main/scala/gitbucket/core/controller/SystemSettingsController.scala # src/main/scala/gitbucket/core/servlet/AutoUpdate.scala	2016-03-06 13:07:03 +09:00
Naoki Takezoe	e8737d263a	Merge pull request #1139 from ritschwumm/wip/sha256 ... generate sha-256 checksum	2016-03-06 12:57:29 +09:00
Naoki Takezoe	4c4b08f1b8	Merge pull request #1127 from McFoggy/issue-1117 ... add X-Hub-Signature security to wekhooks	2016-03-06 12:51:54 +09:00
Naoki Takezoe	6f30ffa865	Fixup	2016-03-05 10:51:45 +09:00
Naoki Takezoe	de3026248c	Bump markedj to 1.0.7-SNAPSHOT	2016-03-05 10:31:27 +09:00
Herr Ritschwumm	413e75be5a	generate checksums without ivy	2016-03-04 14:32:28 +01:00
Herr Ritschwumm	6a8ec18f9a	generate sha256 checksum	2016-03-04 14:06:28 +01:00
Herr Ritschwumm	5b1b2ef3d7	tabs to spaces	2016-03-04 13:55:48 +01:00
Matthieu Brouillard	356202e28a	integrate xhub4j, fixes #1117	2016-03-02 22:25:21 +01:00
Naoki Takezoe	aa0bd5b34a	Update version to 3.12	2016-02-20 23:02:00 +09:00
Naoki Takezoe	7f5024a746	Change javac option to require Java8	2016-02-08 01:11:54 +09:00
Naoki Takezoe	419ea16ead	Remove Specs2 dependency	2016-02-06 22:27:23 +09:00
Naoki Takezoe	bcc05f021c	Migrating testcases to ScalaTest from Specs2	2016-02-02 00:36:08 +09:00
Naoki Takezoe	afa79d01b1	3.11 Release	2016-01-30 09:51:30 +09:00
Naoki Takezoe	40e36e3f8b	Merge branch 'master' ... Conflicts: project/build.scala	2016-01-27 13:35:30 +09:00
Naoki Takezoe	7c8de834bc	Merge executable.sbt with build.sbt	2016-01-26 23:01:12 +09:00
Naoki Takezoe	637e9f906b	Replace build.scala with build.sbt	2016-01-26 22:08:33 +09:00