Gatewify/GitBucket

Fork: 0

Gatewify / GitBucket

History for GitBucket / src / main / scala / gitbucket / core / service / MergeService.scala

2019-08-04	ec39615 Browse files » Deprecate using Naoki Takezoe committed on 4 Aug 2019
2019-08-04	33b4686 Browse files » (refs #2337) Scala 2.13.0 (#2348) takako shimamoto authored on 4 Aug 2019 Naoki Takezoe committed on 4 Aug 2019
2019-07-11	3c8026f Browse files » Implement Draft Pull Request Feature #2319 (#2336) Joobi S B authored on 11 Jul 2019 Naoki Takezoe committed on 11 Jul 2019
2018-12-29	957dfae Browse files » add missing Webhook calling when PR is merged KOUNOIKE committed on 29 Dec 2018
2018-10-08	6974158 Browse files » fix visibility for test KOUNOIKE committed on 8 Oct 2018
2018-10-08	a826589 Browse files » Move webhook call to service KOUNOIKE committed on 8 Oct 2018
2018-10-07	afd68da Browse files » remove unused argument(baseUrl) KOUNOIKE committed on 7 Oct 2018
2018-10-07	6c17b54 Browse files » Move some methods to Service from Controller. KOUNOIKE committed on 7 Oct 2018
2018-06-30	670d23c Browse files » use foreach instead of map xuwei-k committed on 30 Jun 2018
2018-04-01	ac6fbd0 Browse files » add -Xfuture option. fix warnings ... view bounds and procedure syntax are deprecated xuwei-k committed on 1 Apr 2018
2018-04-01	b642783 Browse files » Apply scalafmt Naoki Takezoe committed on 1 Apr 2018
2018-03-17	33812cb Browse files » set filename in conflict message as code peccu committed on 17 Mar 2018
2018-01-11	a045fc6 Browse files » (refs #1838) Fix rebase merge Naoki Takezoe committed on 11 Jan 2018
2017-12-12	8df30ef Browse files » Fix message Naoki Takezoe committed on 12 Dec 2017
	e3c7eb0 Browse files » Fix merge failure Naoki Takezoe committed on 12 Dec 2017
	5b3c3e2 Browse files » Merge branch 'master' into show-conflict-files Naoki Takezoe committed on 12 Dec 2017
	9a12725 Browse files » Update reflog message Naoki Takezoe committed on 12 Dec 2017
2017-12-11	1033122 Browse files » Show conflicting files Naoki Takezoe committed on 11 Dec 2017
	1adc9b3 Browse files » Refactoring Naoki Takezoe committed on 11 Dec 2017
	0309496 Browse files » Fix rebase process Naoki Takezoe committed on 11 Dec 2017
	eb61bc5 Browse files » Implemented squash merge strategy Naoki Takezoe committed on 11 Dec 2017
2017-12-10	fcb374c Browse files » Implemented rebase strategy Naoki Takezoe committed on 10 Dec 2017
2017-12-10	a03d1c9 Browse files » Format code Naoki Takezoe committed on 10 Dec 2017
2017-07-12	db88458 Browse files » Remove unnecessary semicolon Naoki Takezoe committed on 12 Jul 2017
2017-03-10	c5a5c73 Browse files » Introduce syntax suger to tuple extraction Naoki Takezoe committed on 10 Mar 2017
2017-01-13	076bc9e Browse files » remove unused imports xuwei-k committed on 13 Jan 2017
2016-01-16	5807898 Browse files » Small fix about code style Naoki Takezoe committed on 16 Jan 2016
2016-01-02	2d8aa4f Browse files » update button nazoking committed on 2 Jan 2016
2016-01-01	be3aa21 Browse files » Fix compilation error caused by JGit update Naoki Takezoe committed on 1 Jan 2016
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