Commit Graph

845 Commits

Author SHA1 Message Date
takezoe
c0713eaeda (refs #33)Use RequestCache instead of AccountService directly. 2013-07-18 15:55:59 +09:00
takezoe
000afa1ed6 Merge branch 'master' into #33_match-by-email
Conflicts:
	src/main/scala/util/JGitUtil.scala
	src/main/scala/view/helpers.scala
	src/main/twirl/repo/blob.scala.html
	src/main/twirl/repo/commit.scala.html
	src/main/twirl/repo/commits.scala.html
	src/main/twirl/repo/files.scala.html
2013-07-18 15:49:56 +09:00
takezoe
323e25951f Use Gravatar if committer is not registered in GitBucket. 2013-07-18 13:40:21 +09:00
takezoe
dedf5094c1 Small fix and add TODO. 2013-07-18 03:58:39 +09:00
takezoe
269374e6bb Quote src attribute of avatar image. 2013-07-18 03:11:56 +09:00
takezoe
ba567d81cb (refs #3)Add result count to the menu. 2013-07-18 01:12:12 +09:00
takezoe
4fb6005f44 (refs #3)Apply likeEncode to search keyword. 2013-07-18 00:47:55 +09:00
takezoe
69ec4175eb (refs #3)Fix issue search condition. 2013-07-17 21:18:09 +09:00
takezoe
d46e90dcdb (refs #3)Improve presentation for code search results. 2013-07-17 21:13:53 +09:00
takezoe
900e91e101 Bugfix 2013-07-17 19:00:35 +09:00
takezoe
05d7e33d86 (refs #3)Add search form at the top of search result. 2013-07-17 18:32:59 +09:00
takezoe
7f0aff8c03 (refs #3)Cleanup 2013-07-17 16:59:38 +09:00
takezoe
512e59193d (refs #3)Issue search is temporary available. 2013-07-17 16:47:43 +09:00
shimamoto
8f056e4a82 Finished the issues controller refactoring. 2013-07-17 15:36:05 +09:00
takezoe
d06a986293 Remove unused import statement. 2013-07-17 13:57:45 +09:00
shimamoto
d866847c0d (refs #11) Fix comments to display. 2013-07-17 13:56:54 +09:00
takezoe
83472bc354 Remove unused import statement. 2013-07-17 13:55:26 +09:00
shimamoto
ac784f8905 (refs #11) Change the value to be set in the action. 2013-07-17 12:40:23 +09:00
shimamoto
6035281ca1 Change action(IssueComment) to String type. 2013-07-17 12:37:48 +09:00
takezoe
ce8168d97a Fix typo. 2013-07-17 11:54:10 +09:00
takezoe
27670525a3 (refs #3)Search by AND if query words are separated by whitespace. 2013-07-17 11:52:28 +09:00
takezoe
4796d7f450 (refs #3)Search git repository without cloning to the file system. 2013-07-17 06:36:21 +09:00
takezoe
79ec96343f (refs #3)Start work for repository search. 2013-07-17 03:24:47 +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
aae40a7087 Bugfix 2013-07-16 00:11:45 +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
takezoe
78d48c8be3 Remove var! 2013-07-15 13:02:26 +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
fd7d387fb0 (refs #2)Experimental implementation of merge pull request. 2013-07-15 03:47:43 +09:00
takezoe
b68977597b (refs #2)Add tabs to the pull request page. 2013-07-14 14:06:48 +09:00
takezoe
2fb9f83227 (refs #2)Add merge pull request form. 2013-07-14 12:49:49 +09:00
takezoe
6fd312f784 Formatted. 2013-07-14 03:29:17 +09:00
takezoe
12d59231c5 (refs #2)Record 'open pull request' activity. 2013-07-14 03:28:37 +09:00
takezoe
3a7e2c0249 (refs #2)Record 'open pull request' activity. 2013-07-14 03:27:59 +09:00
takezoe
62f2defd91 Fix typo. 2013-07-14 03:23:35 +09:00
takezoe
9048e07b6b (refs #2)Add the details page for the pull request. 2013-07-14 03:01:46 +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
eb82af9006 (refs #2)Implementing the comparing view. 2013-07-13 20:09:19 +09:00
takezoe
2cc2902930 (refs #2)Comparing between the forked repository and the source repository. 2013-07-13 03:52:27 +09:00
takezoe
f4cb0625bc (refs #2)Add PullRequest model. 2013-07-12 16:37:58 +09:00
takezoe
0760b6a89c Merge branch 'master' into fork-and-pullreq
Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/util/JGitUtil.scala
2013-07-12 15:50:53 +09:00
takezoe
f34f60b255 Returns a gray image if username has not been registered. 2013-07-12 15:43:23 +09:00
takezoe
3c2675fd0d Remove unused import statement. 2013-07-12 15:23:01 +09:00
takezoe
f163e348e0 (refs #34)Link conversion checks existence of accounts and issues. 2013-07-12 15:15:58 +09:00