Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 21:15:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,758 Commits 14 Branches 116 Tags
c1263cc16dd5a99a3fa4ab5c5e356a732c403df0
Commit Graph

96 Commits

Author SHA1 Message Date
Naoki Takezoe
c1263cc16d (refs #488)Batch edit for issues 2014-09-23 14:57:29 +09:00
Naoki Takezoe
46041a3762 (refs #488)Apply new UI to the pull request list 2014-09-22 19:10:39 +09:00
Naoki Takezoe
20b0553f7f (refs #488)Exclude pull requests from the issue list 2014-09-22 18:38:28 +09:00
Naoki Takezoe
90487eb7b7 (refs #488)Merge user filter into IssueSearchCondition 2014-09-22 10:08:22 +09:00
Tomofumi Tanaka
2bb1f6168a (refs #437)Show author instead of committer 
* Explicit classify committer and author
* Use author to render avatar image html
* Support commit view
 2014-07-29 00:06:45 +09:00
Tomofumi Tanaka
fa9254c240 (refs #435)Correct merge commit message 
Use ${user}/${branch} instead of ${user}/{repoName}
 2014-07-16 23:33:14 +09:00
Naoki Takezoe
1c99b57709 (refs #412)Fix repository lock 2014-06-29 03:29:03 +09:00
Naoki Takezoe
4f45e047d2 (refs #406)Fix pull request count in the dashboard 2014-06-16 01:40:51 +09:00
Tomofumi Tanaka
dd694d27b5 (refs #324)Update commitIdFrom when pullrequest branch is updated 2014-04-29 17:24:51 +09:00
takezoe
0f9c95c15a baseUrl calculation is concentrated to SystemSettings 2014-04-29 15:43:41 +09:00
Yasuhito Suganuma
7a1c872861 Fix #308 2014-04-25 23:49:17 +09:00
Naoki Takezoe
3f76453f34 (refs #343)Retrieve all commit id from Git repository in pre commit hook instead of COMMIT_LOG table 2014-04-10 17:42:25 +09:00
takezoe
2d0f59b6f2 (refs #307)Fix deletion problem for branches which contains '/' 2014-03-08 04:22:55 +09:00
takezoe
c7a2ec8290 (refs #299)Fix redirection path in PullRequestsController 2014-03-05 16:23:27 +09:00
takezoe
b031103df8 (refs #218)Separate StringUtil#extractCloseId() to add unit test. 2014-03-02 04:49:14 +09:00
odz
8b5414c8f7 Merge branch 'master' into closing-issues-via-commit-messages 
Conflicts:
	src/main/scala/app/PullRequestsController.scala
	src/main/scala/servlet/GitRepositoryServlet.scala
 2014-02-25 00:07:25 +09:00
takezoe
4366c512fe (refs #265)Label editing for the pull request. 2014-02-05 03:07:37 +09:00
takezoe
d882f20436 (refs #254)Change comment action to "delete_branch" from "delete". 2014-02-04 17:20:48 +09:00
takezoe
9d7235af20 (refs #254)Store removed branch name into CONTENT column of COMMENT table. 2014-02-04 17:06:54 +09:00
takezoe
c2eb53d154 (refs #224)Add delete branch button to pull request from same repository. 2014-02-04 09:04:25 +09:00
takezoe
df1f3d8a00 (refs #101)Modification to add rename repository name. 2014-01-13 02:09:05 +09:00
takezoe
6f6a61f31a Fix pattern match for webhook. 2014-01-04 17:23:18 +09:00
takezoe
0e7280585a Fix refs commit log and web hook. 2014-01-04 04:11:41 +09:00
takezoe
0e9bf59c0f Remove some functions from ControlUtil. 2013-12-15 04:21:39 +09:00
takezoe
ac884bd7c3 (refs #196)Fire WebHook in merging pull request from Web GUI. 2013-12-12 04:23:43 +09:00
odz
dc78dc9b0d Close issues via commit messages 2013-11-30 18:57:19 +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
takezoe
7f4def6b83 Ignore Exception instead of TransportException 2013-11-25 18:21:59 +09:00
takezoe
5790d246c8 Ignore TransportException if the source branch had been removed. 2013-11-25 18:16:38 +09:00
odz
223ba791fe Fetch pull request from source repository after updating repository. 2013-11-20 23:59:26 +09:00
Olivier Dagenais
8381e8122a Remove superfluous context.path 
It was generating URLs that look like
http://server.example.com/gitbucket/gitbucket/git/user/repo.git (notice
the extra "/gitbucket"?) when the WAR was deployed in Tomcat.
 2013-11-19 11:48:29 -05:00
takezoe
60e1052d33 (refs #179)Fetch from the source repository before pull request is referred. 2013-11-01 03:12:56 +09:00
Tomofumi Tanaka
9265c68383 (refs #179) Refactor 2013-10-31 01:38:29 +09:00
Tomofumi Tanaka
e7aa766d0a (refs #179) Remove refs/pull/${issueId}/merge 2013-10-31 00:50:27 +09:00
Tomofumi Tanaka
7d8300b3ce (refs #179) Fetch from fork branch before merge 2013-10-31 00:30:18 +09:00
Tomofumi Tanaka
af8a1234ed (refs #179) Improve merge performance 
* merge without tmp dir repository
* remove merging ops from mergeguid
 2013-10-31 00:23:09 +09:00
Tomofumi Tanaka
f96040eade Improve checkConflict 
* Delete temporary RefSpec after checkConflict
* mergeguide use checkconflictInPullRequest instead of checkconflict
 2013-10-30 01:33:56 +09:00
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