Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 15:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,602 Commits 14 Branches 116 Tags
d662df5a7d067b75fd03f4174e10e64c700feb51
Commit Graph

49 Commits

Author SHA1 Message Date
Naoki Takezoe
c5a5c737bf Introduce syntax suger to tuple extraction 2017-03-10 09:53:48 +09:00
Naoki Takezoe
e72a192e4a Merge branch 'master' 
Conflicts:
	build.sbt
	src/main/scala/gitbucket/core/model/CommitStatus.scala
	src/main/scala/gitbucket/core/service/CommitStatusService.scala
	src/main/scala/gitbucket/core/service/CommitsService.scala
	src/main/scala/gitbucket/core/service/IssuesService.scala
	src/main/scala/gitbucket/core/service/RepositoryService.scala
	src/main/scala/gitbucket/core/util/Notifier.scala
 2017-02-06 10:32:29 +09:00
nazoking
cd836f331e use description as bio in user account type 2017-01-16 01:37:19 +09:00
nazoking
8515ef5b26 Merge branch 'master' into group-description 2017-01-15 04:01:54 +09:00
xuwei-k
076bc9e2d6 remove unused imports 2017-01-13 15:09:27 +09:00
nazoking
ecde6aefbf add api 'create an issue' 2017-01-05 05:20:37 +09:00
Naoki Takezoe
cad4d76138 Merge branch 'master' 
Conflicts:
	build.sbt
	src/main/scala/gitbucket/core/service/CommitsService.scala
	src/main/scala/gitbucket/core/service/PullRequestService.scala
	src/main/scala/gitbucket/core/service/RepositoryService.scala
	src/main/scala/gitbucket/core/service/WebHookService.scala
 2016-12-28 02:08:27 +09:00
Naoki Takezoe
892f2d5f41 (refs #1346)Fix tests 2016-12-28 01:45:23 +09:00
Naoki Takezoe
0f6a433623 (refs #1348)Fix testcase 2016-12-11 16:49:47 +09:00
Naoki Takezoe
7fa921e7e5 Merge branch 'master' into slick-3.1-blocking 
Conflicts:
	src/main/scala/gitbucket/core/service/IssuesService.scala
	src/main/scala/gitbucket/core/service/RepositoryService.scala
	src/main/scala/gitbucket/core/util/DatabaseConfig.scala
	src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
 2016-11-11 16:29:34 +09:00
Naoki Takezoe
d70c6cece7 (refs #1286) Fix testcase 2016-11-06 16:37:44 +09:00
xuwei-k
4d13282915 remove unused scalaz 2016-10-05 12:14:43 +09:00
Naoki Takezoe
53f6190267 Scalaz's <| is deprecated 2016-09-28 14:05:40 +09:00
Naoki Takezoe
2b5f74b9f3 Fix test case 2016-08-13 17:55:44 +09:00
Naoki Takezoe
6370a72d81 Fix test case 2016-08-13 13:58:09 +09:00
Naoki Takezoe
ad47ad4269 Merge branch 'master' into mysql_support 
# Conflicts:
#	src/main/resources/update/3_13.sql
#	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
 2016-04-16 11:06:45 +09:00
Naoki Takezoe
1d9fe5770e Merge branch 'webhook-content-type' of https://github.com/McFoggy/gitbucket into McFoggy-webhook-content-type 
# Conflicts:
#	src/main/scala/gitbucket/core/service/WebHookService.scala
#	src/main/twirl/gitbucket/core/settings/edithooks.scala.html
 2016-04-16 00:22:25 +09:00
Naoki Takezoe
2da2b426a1 Merge branch 'master' into solidbase-integration 
# Conflicts:
#	build.sbt
#	src/main/twirl/gitbucket/core/main.scala.html
 2016-04-12 01:08:59 +09:00
Naoki Takezoe
9a42b93d1f Merge pull request #1140 from gitbucket/separate_api_controller 
Separate API controller to improve routing performance
 2016-03-10 01:34:56 +09:00
Matthieu Brouillard
6431d25409 add possibility to choose content type for repository webhooks 2016-03-06 09:51:33 +01:00
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
Naoki Takezoe
876bb396fd Fix testcase 2016-03-06 03:07:33 +09:00
Naoki Takezoe
1b1bd371a4 Fix testcase 2016-03-05 20:11:04 +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
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
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