Naoki Takezoe
539751a1d9
Merge branch 'master' into solidbase-integration
...
# Conflicts:
# build.sbt
# src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
# src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
2016-03-06 13:07:03 +09:00
Matthieu Brouillard
356202e28a
integrate xhub4j, fixes #1117
2016-03-02 22:25:21 +01:00
Naoki Takezoe
44e8c0a9be
Migrating testcase to ScalaTest
2016-02-05 23:00:35 +09:00
Naoki Takezoe
e2c39d7815
Merged branch master into scalatest
2016-02-04 01:51:29 +09:00
Naoki Takezoe
40e36e3f8b
Merge branch 'master'
...
Conflicts:
project/build.scala
2016-01-27 13:35:30 +09:00
lidice
64cacb18a4
Extend API to allow CRUD labels
...
Add Labels API
* List all labels for this repository
* Get a single label
* Create a label
* Update a label
* Delete a label
Reject duplicated label name
Add test case for LabelsService
2016-01-22 07:44:35 +09:00
Naoki Takezoe
1201271949
Merge branch 'master' into solidbase-integration
...
Conflicts:
src/main/scala/gitbucket/core/model/Profile.scala
src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
2016-01-19 15:31:26 +09:00
Naoki Takezoe
206d597d9b
Fix testcase
2016-01-19 12:50:54 +09:00
Naoki Takezoe
1b4c621fef
Change CommitHook to ReceiveHook
2016-01-19 12:26:20 +09:00
Naoki Takezoe
8dcb8c2ecb
Fix testcase
2016-01-17 01:48:56 +09:00
Naoki Takezoe
4abd4a4bac
Merge branch 'feature/protected-branch' of https://github.com/team-lab/gitbucket into team-lab-feature/protected-branch
2016-01-17 00:01:18 +09:00
Naoki Takezoe
f5c1c0703d
Fix compilation error in testcase
2016-01-13 11:47:59 +09:00
Naoki Takezoe
5036b1a1aa
Replace migration system with Solidbase
2016-01-10 01:43:13 +09:00
nazoking
781d465f8d
MergeServiceSpec more likely to succeed
2016-01-02 20:58:44 +09:00
nazoking
766867f341
add test
2016-01-02 20:41:23 +09:00
nazoking
a08a212fdc
feature/can select webhook events
2015-10-13 18:48:02 +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
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
