Commit Graph

24 Commits

Author SHA1 Message Date
Naoki Takezoe
0ede7e9921 (refs #374)Upgrading to Scalatra 2.3 and Slick 2.1.
Some compilation errors in Slick code are remaining.
2014-07-30 07:36:35 +09:00
shimamoto
b13820fc0e Improved model package. The details are as follows:
* Fix the Profiles class from package object to simple object
* Fix the row case class to model package
* Define the alias of JdbcBackend#Session
2014-07-28 04:52:56 +09:00
Naoki Takezoe
121b6ee641 Fix incremental compilation problem caused by Slick.
This is temporary fix to decrease compilation time in development. Therefore this fix will be reverted in the future to add multiple database support capability.
2014-07-27 03:31:45 +09:00
Naoki Takezoe
9cfa8c594b Merge branch 'master' into slick2
Conflicts:
	project/build.scala
	src/main/scala/app/IndexController.scala
	src/main/scala/app/RepositorySettingsController.scala
	src/main/scala/model/Account.scala
	src/main/scala/model/BasicTemplate.scala
	src/main/scala/model/Issue.scala
	src/main/scala/model/IssueComment.scala
	src/main/scala/model/package.scala
	src/main/scala/service/IssuesService.scala
	src/main/scala/service/PullRequestService.scala
	src/main/scala/service/RepositoryService.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/servlet/TransactionFilter.scala
	src/main/scala/util/Notifier.scala
2014-07-06 17:02:49 +09:00
Naoki Takezoe
cce0b67871 (refs #341)Fix compilation error of delete statements 2014-07-06 15:42:45 +09:00
shimamoto
d2c94909cb (refs #341) Migrate service package. 2014-06-24 02:40:40 +09:00
Naoki Takezoe
4f45e047d2 (refs #406)Fix pull request count in the dashboard 2014-06-16 01:40:51 +09:00
Tomofumi Tanaka
dc21e8388e Improve update pull request query
commitIdFrom and commitIdTo columns update by one query.
2014-05-02 19:55:49 +09:00
Tomofumi Tanaka
dd694d27b5 (refs #324)Update commitIdFrom when pullrequest branch is updated 2014-04-29 17:24:51 +09:00
takezoe
7e10618ceb Merge branch 'pullreq-update-in-push' of https://github.com/odz/gitbucket into odz-pullreq-update-in-push
Conflicts:
	src/main/scala/app/PullRequestsController.scala
2013-11-30 02:35:21 +09:00
odz
223ba791fe Fetch pull request from source repository after updating repository. 2013-11-20 23:59:26 +09:00
takezoe
60e1052d33 (refs #179)Fetch from the source repository before pull request is referred. 2013-11-01 03:12:56 +09:00
xuwei-k
d772fc3ba2 refactoring. avoid Option#get 2013-10-14 01:18:31 +09:00
takezoe
e89b2020a3 Use ControlUtil. 2013-09-21 22:13:15 +09:00
takezoe
1ebf4276e7 (refs #2)'Pull Requests' tab in dashboard has been completed. 2013-08-07 03:31:26 +09:00
takezoe
908931b9ed (refs #2)Implementing 'Pull Requests' tab in the dashboard. 2013-08-06 22:04:09 +09:00
takezoe
f31848721c Remove unnecessary comment and format code. 2013-08-05 18:49:08 +09:00
takezoe
6101e141d8 (refs #2)Add opened user filter and count to the pull request list. 2013-08-05 18:47:40 +09:00
takezoe
71d84e7475 (refs #2)Limit of pull request list is 25. 2013-08-05 16:34:11 +09:00
takezoe
4ea23a96ae (refs #2)Implementing pull request list. 2013-08-05 03:31:27 +09:00
takezoe
88caff38f0 (refs #2)Fix pull request. Basic pattern had been tested but it's still unstable. 2013-07-24 22:05:36 +09:00
takezoe
9bb6b216e9 (refs #2)Add columns MERGE_START_ID and MERGE_END_ID to PULL_REQUEST. 2013-07-15 04:49:14 +09:00
takezoe
2fb9f83227 (refs #2)Add merge pull request form. 2013-07-14 12:49:49 +09:00
takezoe
0903721a62 (refs #2)Create pull request is available. 2013-07-14 02:43:45 +09:00