johnpearcey/gitbucket

Fork: 0

johnpearcey / gitbucket_jkp

History for gitbucket_jkp / src / test / scala / gitbucket / core / service

2016-04-16	ad47ad4 Browse files » Merge branch 'master' into mysql_support ... # Conflicts: # src/main/resources/update/3_13.sql # src/main/scala/gitbucket/core/servlet/AutoUpdate.scala Naoki Takezoe committed on 16 Apr 2016
2016-04-15	1d9fe57 Browse files » 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 Naoki Takezoe committed on 15 Apr 2016
2016-04-11	2da2b42 Browse files » Merge branch 'master' into solidbase-integration ... # Conflicts: # build.sbt # src/main/twirl/gitbucket/core/main.scala.html Naoki Takezoe committed on 11 Apr 2016
2016-03-09	9a42b93 Browse files » Merge pull request #1140 from gitbucket/separate_api_controller ... Separate API controller to improve routing performance Naoki Takezoe committed on 9 Mar 2016
2016-03-06	6431d25 Browse files » add possibility to choose content type for repository webhooks Matthieu Brouillard committed on 6 Mar 2016
2016-03-06	539751a Browse files » 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 Naoki Takezoe committed on 6 Mar 2016
2016-03-05	876bb39 Browse files » Fix testcase Naoki Takezoe committed on 5 Mar 2016
2016-03-05	1b1bd37 Browse files » Fix testcase Naoki Takezoe committed on 5 Mar 2016
2016-03-02	356202e Browse files » integrate xhub4j, fixes #1117 Matthieu Brouillard committed on 2 Mar 2016
2016-02-05	44e8c0a Browse files » Migrating testcase to ScalaTest Naoki Takezoe committed on 5 Feb 2016
2016-02-03	e2c39d7 Browse files » Merged branch master into scalatest Naoki Takezoe committed on 3 Feb 2016
2016-01-27	40e36e3 Browse files » Merge branch 'master' ... Conflicts: project/build.scala Naoki Takezoe committed on 27 Jan 2016
2016-01-21	64cacb1 Browse files » 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 lidice committed on 21 Jan 2016
2016-01-19	1201271 Browse files » Merge branch 'master' into solidbase-integration ... Conflicts: src/main/scala/gitbucket/core/model/Profile.scala src/main/scala/gitbucket/core/servlet/AutoUpdate.scala Naoki Takezoe committed on 19 Jan 2016
	206d597 Browse files » Fix testcase Naoki Takezoe committed on 19 Jan 2016
	1b4c621 Browse files » Change CommitHook to ReceiveHook Naoki Takezoe committed on 19 Jan 2016
2016-01-16	8dcb8c2 Browse files » Fix testcase Naoki Takezoe committed on 16 Jan 2016
2016-01-16	4abd4a4 Browse files » Merge branch 'feature/protected-branch' of https://github.com/team-lab/gitbucket into team-lab-feature/protected-branch Naoki Takezoe committed on 16 Jan 2016
2016-01-13	f5c1c07 Browse files » Fix compilation error in testcase Naoki Takezoe committed on 13 Jan 2016
2016-01-09	5036b1a Browse files » Replace migration system with Solidbase Naoki Takezoe committed on 9 Jan 2016
2016-01-02	781d465 Browse files » MergeServiceSpec more likely to succeed nazoking committed on 2 Jan 2016
2016-01-02	766867f Browse files » add test nazoking committed on 2 Jan 2016
2015-10-13	a08a212 Browse files » feature/can select webhook events nazoking committed on 13 Oct 2015
2015-04-08	6793a86 Browse files » fix some api user is invalid ... issue.userName -> issue.openedUserName issueComment.userName -> issueComment.commentedUserName nazoking committed on 8 Apr 2015
2015-04-05	23c146f Browse files » 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 Naoki Takezoe committed on 5 Apr 2015
2015-03-30	ab19d47 Browse files » (refs #442)show compare/pull request link near branch link. nazoking committed on 30 Mar 2015
2015-03-28	b39e863 Browse files » add test for getFileList nazoking committed on 28 Mar 2015
2015-03-16	7e92f1a Browse files » Fix test code package name Tomofumi Tanaka committed on 16 Mar 2015
2015-03-16	6acbd5b Browse files » 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 Tomofumi Tanaka committed on 16 Mar 2015
2015-03-02	be75cef Browse files » Fix testcase takezoe committed on 2 Mar 2015