Commit Graph

86 Commits

Author SHA1 Message Date
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
hrj
dc6fdaf482 Fix for test compilation 2016-08-04 10:03:35 +05:30
KOUNOIKE Yuusuke
6b2fbb3bf0 add some API. required by Jenkins GitHub Branch Source plugin 2016-07-25 23:52:08 +09:00
Naoki Takezoe
01c2291715 Fix testcase 2016-07-13 02:14:44 +09:00
Naoki Takezoe
fd181b9a0c Fix emoji conversion 2016-07-10 02:03:25 +09:00
Naoki Takezoe
f71acfcbe8 Skip external database test in Travis build 2016-05-26 20:01:54 +09:00
Naoki Takezoe
c65e843491 Use Travis provided DB in migration test 2016-05-26 19:01:06 +09:00
Naoki Takezoe
9103c88f0e Add migration test 2016-05-26 15:36:49 +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
nazoking
91cda6d245 Merge pull request #1144 from distkloc/pull-request-key-in-issues-api
Add pull_request key in list issues api if an issue is a pull request
2016-03-10 12:35:48 +09:00
distkloc
a82e579d57 Add pull_request key in list issues api if an issue is a pull request 2016-03-10 02:08:09 +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
8145cba111 Merge branch 'wip/baseurl' of https://github.com/ritschwumm/gitbucket into ritschwumm-wip/baseurl 2016-02-12 23:15:59 +09:00
Naoki Takezoe
8fd92f1c2f Fix compilation error in testcase 2016-02-06 23:39:57 +09:00
Naoki Takezoe
419ea16ead Remove Specs2 dependency 2016-02-06 22:27:23 +09:00
Naoki Takezoe
e72d808a3c Migrating testcase to ScalaTest 2016-02-06 22:10:20 +09: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
911754e1dc Migrating testcase to ScalaTest 2016-02-04 00:40:58 +09:00
Naoki Takezoe
0067cbce6f Fix failed test 2016-02-04 00:37:50 +09:00
Naoki Takezoe
f40f8427aa Replace === with == 2016-02-04 00:27:00 +09:00
Naoki Takezoe
bcc05f021c Migrating testcases to ScalaTest from Specs2 2016-02-02 00:36:08 +09:00
Herr Ritschwumm
a1bacccc09 add tests, failing right now 2016-01-30 16:25:44 +01:00
Herr Ritschwumm
3f2935612d feature: add settings for the ssh host 2016-01-30 11:15:07 +01: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
6661314be5 Add git proection api and form 2016-01-02 20:20:24 +09:00
Naoki Takezoe
cbb847704b Fix compilation error in testcase 2016-01-02 03:07:53 +09:00
Naoki Takezoe
4457a317e6 (refs #815)Upgrade Scalatra to 2.4.0 2015-12-30 05:27:09 +09:00
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