Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 14:05:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,851 Commits 14 Branches 116 Tags
1e89e70e5727613117b7a291e154b13ef12be5c8
Commit Graph

178 Commits

Author SHA1 Message Date
Naoki Takezoe
bb804f6597 Merge pull request #1696 from gitbucket/api_repository_ssh_url 
Add ssh_url to web hook request and API response
 2017-09-20 16:18:35 +09:00
Naoki Takezoe
7021942a6e Merge branch 'add_assignee_to_pr_api' 2017-09-05 20:37:03 +09:00
Naoki Takezoe
9251d64de8 Avoid database access in model 
Modified to pass assignee from outside of model instead.
 2017-09-05 19:47:41 +09:00
Naoki Takezoe
d0c99727e9 Fix testcases 2017-09-05 16:06:06 +09:00
Naoki Takezoe
2e80e3baaf Fix testcase 2017-09-03 03:52:00 +09:00
KOUNOIKE Yuusuke
e77045abe3 Merge remote-tracking branch 'upstream/master' into pr-handle-errors 
# Conflicts:
#	src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
#	src/main/scala/gitbucket/core/service/SystemSettingsService.scala
#	src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
 2017-08-20 21:50:34 +09:00
KOUNOIKE Yuusuke
040d812f2a add debug option to SystemSettings. and error page shows stacktrace only for admin or debug settings. 2017-08-17 17:48:53 +09:00
KOUNOIKE Yuusuke
92fea3ff01 fix test. 2017-08-15 02:44:52 +09:00
HairyFotr
0149593272 Fix lint and typos 2017-08-08 21:37:35 +02:00
Naoki Takezoe
db88458a14 Remove unnecessary semicolon 2017-07-12 18:42:14 +09:00
Yasuhiro Takagi
884fc5318a Add assignee entry for the result of pull request related api 2017-06-25 13:33:27 +09:00
Naoki Takezoe
880c6ac554 Merge branch 'master' into pr-add-account-webhook 2017-06-18 18:15:41 +09:00
Istvan Meszaros
889e94a494 Priorities now integrated with issues. 2017-06-11 15:45:14 +02:00
xuwei-k
2a3e4af082 update MySQL v5_7_latest in test 
v5_7_10 does not work Sierra

https://github.com/wix/wix-embedded-mysql/blob/wix-embedded-mysql-2.1.4/src/main/java/com/wix/mysql/distribution/Version.java#L86
 2017-04-02 15:58:43 +09:00
KOUNOIKE Yuusuke
8087531d64 fix test. 2017-03-14 07:36:07 +09:00
KOUNOIKE Yuusuke
0eab5295db Fix test. 2017-03-11 20:31:59 +09:00
Naoki Takezoe
c5a5c737bf Introduce syntax suger to tuple extraction 2017-03-10 09:53:48 +09:00
Naoki Takezoe
200760cc56 Merge pull request #1459 from xuwei-k/mock-package-warning 
fix deprecation warnings
 2017-02-20 12:47:00 +09:00
xuwei-k
c0d9689022 fix deprecation warning 
https://github.com/FasterXML/jackson-core/blob/jackson-core-2.8.4/src/main/java/com/fasterxml/jackson/core/JsonParseException.java#L31
 2017-02-20 11:45:09 +09:00
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