nazoking
84d97817e3
add comment
2015-11-09 13:57:37 +09:00
nazoking
2c6d2176bb
fix space
2015-11-09 13:57:26 +09:00
nazoking
7840d28ed2
add webhook pull-request-review-comment
2015-11-09 12:20:07 +09:00
nazoking
66b5fe7337
Merge branch 'master' into feature/webhook-scope
2015-11-06 14:48:03 +09:00
Naoki Takezoe
bd9e064137
Merge pull request #925 from team-lab/feature/add-compare-link-for-webhook-push
...
Feature/add properties for webhook push
2015-10-31 02:57:24 +09:00
Tobias Roeser
00cd3adc7b
Refined regex and removed explicit TLDs
...
Also made regex val private.
2015-10-14 22:42:35 +02:00
Tobias Roeser
5a97a518a6
Detect links and render them as HTML links in repo description
2015-10-14 14:41:09 +02:00
nazoking
a08a212fdc
feature/can select webhook events
2015-10-13 18:48:02 +09:00
nazoking
d13bb47ee7
remove ApiPushCommit class (merge to ApiCommit)
2015-10-06 02:27:42 +09:00
nazoking
8b8c6ee861
fix repository.url on webhook push payload
2015-10-06 02:15:03 +09:00
Naoki Takezoe
73cf9661ac
Fix url encoding to encode whitespace to %20
2015-10-03 04:00:08 +09:00
Naoki Takezoe
c5da975cea
Merge pull request #919 from team-lab/fix-push-commit-url
...
fix commit url in webhook `push` event.
2015-10-02 21:13:58 +09:00
nazoking
ace65cf261
(refs #920 ) Remove IssueOrPullRequest. it is too much for this purpose
2015-10-02 11:59:25 +09:00
nazoking
bf64f6b4f4
api url is only issues
2015-10-02 00:33:23 +09:00
nazoking
0283ec574d
fix pull-request url on webhook payload
2015-10-02 00:23:13 +09:00
nazoking
bb9add9da9
fix commit url in push webhook.
2015-10-01 22:56:36 +09:00
Naoki Takezoe
3c53fd8618
Merge branch 'issue-893' of https://github.com/McFoggy/gitbucket into McFoggy-issue-893
2015-09-24 01:21:00 +09:00
Naoki Takezoe
e1c155d09d
Fix Markdown testcase
2015-09-21 12:08:16 +09:00
Matthieu Brouillard
0772070523
split SMTP & notification, fixes #893
2015-09-02 16:22:54 +02:00
Steve Kemp
f73c86d533
Updated to fix truncated name in JSON: watchers_coun
...
The correct field in the JSON should be `watchers_count` rather
than the truncated version `watchers_coun`.
2015-08-18 09:14:44 +03:00
Naoki Takezoe
67ee6857ad
Remove unnecessary spec
2015-07-28 11:16:02 +09:00
Naoki Takezoe
ed05422ea8
Merge branch 'implement-668' of https://github.com/beraboris/gitbucket into beraboris-implement-668
2015-07-28 01:58:30 +09:00
Naoki Takezoe
124f331963
Fix testcase
2015-07-18 22:01:45 +09:00
Boris Bera
28c47dd9c7
AccountService.updateGroup now handles group description
2015-07-04 14:42:55 -04:00
Boris Bera
cd62220ba0
AccountService.createGroup now handles group description
2015-07-04 02:35:02 -04:00
Boris Bera
96e6aa89e3
Added group description field to account
2015-07-04 02:17:14 -04:00
Boris Bera
f1d2a71b49
Fixed url generated by pull request/compare button
...
The `:` character was getting escaped leading to an ugly url. This is
different from the urls generated when editing the branches in a pull
request. In that case the url did not have `:` escaped.
2015-07-03 21:23:53 -04:00
Boris Bera
fd4fe0dc0d
Pullreqs in forks now use upstream master as origin
...
This implements #668 .
2015-07-03 20:56:06 -04:00
Naoki Takezoe
374342cfc1
Merge pull request #718 from team-lab/feature/api-add-issue-urls
...
Feature/api add issue urls
2015-05-06 21:19:59 +09:00
Naoki Takezoe
c7a7be1de0
(refs #441 )Fix testcase
2015-04-29 15:26:14 +09:00
nazoking
ebc5219ce6
(refs #721 )NullPointerException on getFileList if branch has multi-origin and get sub-folder file list
2015-04-22 13:45:31 +09:00
nazoking
5568acc5f3
add html_url on api issue-comment
2015-04-20 14:32:16 +09:00
nazoking
c467594199
add html_url and comments_url on api issue
2015-04-20 13:19:17 +09:00
nazoking
6793a86bae
fix some api user is invalid
...
issue.userName -> issue.openedUserName
issueComment.userName -> issueComment.commentedUserName
2015-04-08 20:16:47 +09:00
Naoki Takezoe
23c146fc5d
Merge branch 'feature/#422-compare-link-near-branch-selector' of https://github.com/team-lab/gitbucket into team-lab-feature/#422-compare-link-near-branch-selector
...
Conflicts:
src/main/twirl/gitbucket/core/repo/files.scala.html
2015-04-05 16:52:47 +09:00
nazoking
ab19d473c4
(refs #442 )show compare/pull request link near branch link.
2015-03-30 21:16:42 +09:00
nazoking
27864a3a3c
Performance Improve for getFileList
2015-03-29 01:21:10 +09:00
nazoking
b39e863591
add test for getFileList
2015-03-29 01:12:33 +09:00
Tomofumi Tanaka
7e92f1abd5
Fix test code package name
2015-03-16 23:38:00 +09:00
Tomofumi Tanaka
6acbd5b2cf
Merge remote-tracking branch 'origin/master' into api-support
...
Conflicts:
src/main/scala/ScalatraBootstrap.scala
src/main/scala/gitbucket/core/controller/AccountController.scala
src/main/scala/gitbucket/core/controller/ControllerBase.scala
src/main/scala/gitbucket/core/controller/IssuesController.scala
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
src/main/scala/gitbucket/core/model/Profile.scala
src/main/scala/gitbucket/core/service/PullRequestService.scala
src/main/scala/gitbucket/core/service/WebHookService.scala
src/main/scala/gitbucket/core/servlet/InitializeListener.scala
src/main/scala/gitbucket/core/view/helpers.scala
src/main/twirl/gitbucket/core/pulls/conversation.scala.html
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
src/main/twirl/issues/listparts.scala.html
2015-03-16 22:49:47 +09:00
takezoe
be75cef752
Fix testcase
2015-03-03 02:38:59 +09:00
Naoki Takezoe
d495b04d85
Change package name
2015-03-02 22:15:56 +09:00
