Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 14:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,488 Commits 14 Branches 116 Tags
7f436831fe96153f4a177d3c0f46e512a1819d5a
Commit Graph

109 Commits

Author SHA1 Message Date
xuwei-k
7f436831fe fix deprecation warnings 
https://github.com/scalatest/scalatest/blob/release-3.0.0/scalatest/src/main/scala/org/scalatest/mock/package.scala#L38
 2017-02-20 11:34:02 +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
Naoki Takezoe
7c484297d7 Merge pull request #1424 from team-lab/account-description 
Account description
 2017-01-16 13:17:04 +09:00
nazoking
092e832d21 Prevents security warning dialog from being displayed during testing. 2017-01-16 02:06:39 +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
4c4327b569 bump embedded-mysql for windows support 2017-01-13 01:55:24 +09:00
Naoki Takezoe
64db3e7842 Merge pull request #1404 from team-lab/feature-create-an-issue-api 
add api 'create an issue'
 2017-01-06 15:09:58 +09:00
nazoking
ecde6aefbf add api 'create an issue' 2017-01-05 05:20:37 +09:00
Naoki Takezoe
8d7ec16ed0 (refs #1101)Remove debug code 2017-01-04 14:13:09 +09:00
Naoki Takezoe
30c8d3c39c (refs #1101)Fix testcase 2017-01-03 22:44:30 +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
a60b43b862 (refs #1271)Fix testcase 2016-12-10 12:14:24 +09:00
Naoki Takezoe
27930a5849 Fix testcase 2016-11-20 00:00:58 +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
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