109 Commits

Author	SHA1	Message	Date
Tomofumi Tanaka	dcbf283c9d	Improve checkConflict	2013-10-29 01:24:06 +09:00
takezoe	53fa60b0f8	Exclude owner from assigned user list in the group repository.	2013-10-24 02:00:14 +09:00
takezoe	ebf4e5f2e9	Merge branch 'account-full-name' of https://github.com/robinst/gitbucket into robinst-account-full-name ... Conflicts: src/main/scala/app/PullRequestsController.scala	2013-10-14 13:40:06 +09:00
xuwei-k	5a3207ae42	avoid NumberFormatException	2013-10-14 03:26:47 +09:00
xuwei-k	dae0d0ad4b	use FileUtil.withTmpDir and FileUtil.using	2013-10-11 02:44:03 +09:00
takezoe	cf79ac1069	(refs #142)Fix NoSuchElementException for empty repository.	2013-10-11 02:42:07 +09:00
Robin Stocker	13bff2963e	Add full name to account and use it to create commits (#125) ... The Git practice is to use the full name when creating commits, not a user name. This commit fixes that by introducing a fullName field to Account and using it when creating commits. For migrating from earlier versions, the user name is used as an initial value for the full name field.	2013-10-06 23:11:09 +02:00
takezoe	bb03a6fc9b	(refs #94)The merge-guide is separated as HTML fragment and retrieve them by Ajax.	2013-09-23 13:25:06 +09:00
takezoe	c57bc487a3	Define session keys.	2013-09-23 00:51:57 +09:00
takezoe	296fc9a3df	Improve session handling.	2013-09-23 00:18:38 +09:00
takezoe	fd8b5780f3	Use ControlUtil.	2013-09-22 19:28:14 +09:00
takezoe	f30c9f6171	Use ControlUtil.	2013-09-22 01:24:04 +09:00
takezoe	b4dd067d61	Introduce ControlUtil which provides control facilities such as using() or defining().	2013-09-19 18:53:14 +09:00
takezoe	06b0dbf2e5	Remove TODO.	2013-09-18 14:24:15 +09:00
shimamoto	3c0681d55d	(refs #10) Add notification of when merged.	2013-09-04 10:40:44 +09:00
takezoe	bdc06feb88	Fix a problem in pull request to branches other than the master branch.	2013-09-03 20:58:38 +09:00
shimamoto	3fc792fcf8	(refs #10) Add notification. Notification of when merging is not ... implemented yet.	2013-09-02 07:40:41 +09:00
takezoe	52ab3c625e	(refs #76)Show the content of the previous commit for removed files.	2013-08-15 02:22:11 +09:00
takezoe	e10777576f	Comparing is accessible by users who can refer to the repository.	2013-08-11 00:47:23 +09:00
takezoe	69c5f9e19a	Always display repository selector in the new pull request page.	2013-08-10 12:34:07 +09:00
takezoe	1e566f4a20	(refs #69)Forked repositories tree is changed to flat list. ... Because it can't render forked tree correctly if parent repository has been removed.	2013-08-09 21:43:30 +09:00
takezoe	5930cf48d5	(refs #2)Fix redirect path after sending pull request.	2013-08-08 02:04:55 +09:00
takezoe	9dd070887a	(refs #2)Merge comment is displayed on the comment list (but it's not included in comment count).	2013-08-08 01:42:42 +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	8c86e23a4c	(refs #2)HTML parts sharing in issues and pull requests.	2013-08-05 21:57:45 +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	735ad4c972	Fix comment.	2013-08-05 15:19:16 +09:00
takezoe	50cb59f569	(refs #2)Add action type "merge" for ISSUE_COMMENT.	2013-08-05 15:16:26 +09:00
takezoe	4ea23a96ae	(refs #2)Implementing pull request list.	2013-08-05 03:31:27 +09:00
takezoe	b015645ed0	(refs #2)Add flag for identifying whether it's a pull request.	2013-08-05 02:06:15 +09:00
takezoe	ce3b10ef03	(refs #2)Restore checkConflict method.	2013-08-05 01:35:08 +09:00
takezoe	d7af5551eb	(refs #2)Fix temporary branch name.	2013-08-05 00:53:30 +09:00
takezoe	1d03a82be4	(refs #2)Pull request works!	2013-08-05 00:49:09 +09:00
takezoe	7a8958741d	(refs #2)Add NO_FF option to merging pull request.	2013-07-29 02:10:21 +09:00
takezoe	f317d74bb4	(refs #2)Pull request to the branch in the same repository is available.	2013-07-27 13:02:22 +09:00
takezoe	5f0eb91a81	(refs #2)Compare to its own branch if repository is not specified.	2013-07-27 04:24:58 +09:00
takezoe	66f3a1fe7d	(refs #2)Comparing between all forked repositories.	2013-07-27 04:11:33 +09:00
takezoe	59d85531ce	Bugfix	2013-07-26 18:29:00 +09:00
takezoe	1af52d16c0	Add lock for repository operation.	2013-07-26 18:14:31 +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	205119cc01	(refs #2)Fix compile errors.	2013-07-24 13:33:07 +09:00
takezoe	2c52a4c40c	(refs #2)Fix pull request and marge behavior.	2013-07-16 21:02:22 +09:00
takezoe	f53f71ecf1	(refs #2)Add conflict checking.	2013-07-16 03:43:26 +09:00
takezoe	e59ae9c6e9	(refs #2)Remove unused code.	2013-07-16 00:29:30 +09:00
takezoe	20e5832ce3	(refs #2)Pull request details page became a single page.	2013-07-15 23:02:54 +09:00
takezoe	fc29b34573	(refs #2)Fix comparing diffs before sending pull request.	2013-07-15 21:40:54 +09:00
takezoe	5ea9150af8	(refs #2)Fix requested repository url in the merge guidance.	2013-07-15 14:40:50 +09:00
takezoe	159a5835e0	(refs #2)Close issue when pull request is merged.	2013-07-15 14:17:26 +09:00