Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 23:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,618 Commits 14 Branches 116 Tags
26689779189f7ce7db43366fb8557383604c2947
Commit Graph

70 Commits

Author SHA1 Message Date
Naoki Takezoe
2668977918 Convert CRLF to LF 2014-07-06 17:07:52 +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
5c70cd654c (refs #341)Add TODO about Slick 2.0 migration 2014-07-06 16:21:25 +09:00
Naoki Takezoe
cce0b67871 (refs #341)Fix compilation error of delete statements 2014-07-06 15:42:45 +09:00
Naoki Takezoe
606cd83f44 Fix CRLF to LF 2014-07-06 13:19:27 +09:00
shimamoto
d5e1b18b52 (refs #341) Sets default value. 2014-07-01 03:40:21 +09:00
Naoki Takezoe
fd09058a7d (refs #310)Convert all CRLF to LF 2014-06-29 04:16:37 +09:00
shimamoto
d2c94909cb (refs #341) Migrate service package. 2014-06-24 02:40:40 +09:00
shimamoto
bbe455ac49 (refs #341) Migrate model package. 2014-06-16 01:29:56 +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
f99d37cfad (refs #115)Adding SSH Key form is available 2014-03-09 00:57:00 +09:00
takezoe
8fc1a5473b (refs #115)Add table and model to store public keys 2014-03-08 19:26:49 +09:00
takezoe
e3fd564efd (refs #241)Work for specifying group manager 2014-03-04 04:25:44 +09:00
takezoe
4f10bccf84 (refs #114)Add logical remove flag to ACCOUNT. 2013-11-01 03:38:33 +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
4d1605ded2 (refs #74)Add web hook URL addition. 2013-09-06 02:32:51 +09:00
takezoe
940e2f4759 (refs #74)Add WEB_HOOK table. 2013-09-02 18:17:28 +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
4bd4c3e833 Merge branch 'master' into fork-and-pullreq 
Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/util/JGitUtil.scala
 2013-07-26 18:22:14 +09:00
takezoe
e15bd77789 (refs #2)Add forked count and repository tree view. 2013-07-25 20:47:35 +09:00
shimamoto
a5f12a50e6 Add view ISSUE_OUTLINE_VIEW. 2013-07-25 20:28:19 +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
f10f98abf2 Merge branch 'master' into fork-and-pullreq 
Conflicts:
	src/main/resources/update/1_3.sql
	src/main/resources/update/1_4.sql
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/twirl/account/repositories.scala.html
 2013-07-24 13:29:23 +09:00
takezoe
ec73294900 (refs #8)Add model for GROUP_MEMBER. 2013-07-23 11:08:36 +09:00
takezoe
30eb949ce1 (refs #8)Start to implement group management. 2013-07-22 22:22:49 +09:00
shimamoto
b23133c79c Move Implicit && to model package object. 2013-07-18 20:21:24 +09:00
shimamoto
6035281ca1 Change action(IssueComment) to String type. 2013-07-17 12:37:48 +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
takezoe
bf3380755b (refs #2)Fix PULL_REQUEST schema. 2013-07-14 01:25:27 +09:00
takezoe
f4cb0625bc (refs #2)Add PullRequest model. 2013-07-12 16:37:58 +09:00
takezoe
5e1eb39b87 (refs #2)Experimental implementation of forking repository. 2013-07-11 14:39:25 +09:00
takezoe
e4324258d3 (refs #28)Implementing avatar image uploading. 2013-07-10 11:34:36 +09:00
shimamoto
136a654639 Improve mapping of custom column type. 2013-07-08 17:25:31 +09:00
takezoe
6005282d9f (refs #4)The base of activity timeline is completed. 2013-07-07 13:40:04 +09:00
takezoe
54e0242030 (refs #4)Record wiki activity. 2013-07-07 01:24:08 +09:00
takezoe
e50c4528a6 (refs #4)Add issue close, reopen and comment activity. 2013-07-06 22:07:51 +09:00
takezoe
f84078c7ca (refs #4)Add 'Public Activity' tab to the account information page. 2013-07-06 20:03:34 +09:00
shimamoto
1fc91ee199 Fix byPrimaryKey problem. 2013-07-01 21:09:59 +09:00
takezoe
56cec26c5b Fix byPrimaryKey problem. 2013-07-01 20:21:33 +09:00
shimamoto
741596a6f5 Add action to model 'issue comment'. 2013-07-01 19:05:20 +09:00
takezoe
8e45a8d3dd Bug fix 2013-07-01 13:05:37 +09:00
takezoe
c4d9cd940e Bug fix. 2013-07-01 11:11:58 +09:00
takezoe
bea6d156ed Fix services to use shortcut method for primary key and foreign keys. 2013-06-29 13:40:01 +09:00
shimamoto
a3133fa128 Add the condition function by the primary key. 2013-06-29 04:44:29 +09:00
shimamoto
f170aa0a04 Fix model composition. 2013-06-28 15:05:15 +09:00
shimamoto
a217513205 Move userName and repositoryName to the base table class. 2013-06-27 21:59:13 +09:00
takezoe
a5c5998fc8 Replace native SQL which retrieves issue count with type safe DSL. 2013-06-26 14:38:08 +09:00
takezoe
0547532113 Add search condition behavior to the issues page. 2013-06-25 13:54:58 +09:00