sanctureplicum/gitea

Commit Graph

Author	SHA1	Message	Date
Ing. Jaroslav Šafka	8420c1bf4c	Fix checks in PR for empty commits #19603 (#20290 ) * Fixes issue #19603 (Not able to merge commit in PR when branches content is same, but different commit id) * fill HeadCommitID in PullRequest * compare real commits ID as check for merging * based on @zeripath patch in #19738	2022-07-13 16:22:51 +08:00
6543	a9cc9c0f7a	Auto merge pull requests when all checks succeeded via WebUI (#19648 ) Add WebUI part of Auto merge feature close #19621 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: delvh <dev.lh@web.de>	2022-06-11 16:44:20 +02:00
wxiaoguang	368baf9e77	Use Vue to refactor pull merge UI (#19650 ) * Use Vue to refactor pull merge UI * add comments * fix comments * small fine tune * fix tests * adopt new pull default messages * clean up Co-authored-by: 6543 <6543@obermui.de>	2022-05-12 21:39:02 +08:00

Author

SHA1

Message

Date

Ing. Jaroslav Šafka

8420c1bf4c

Fix checks in PR for empty commits #19603 (#20290 )

* Fixes issue #19603 (Not able to merge commit in PR when branches content is same, but different commit id)
* fill HeadCommitID in PullRequest
* compare real commits ID as check for merging
* based on @zeripath patch in #19738

2022-07-13 16:22:51 +08:00

6543

a9cc9c0f7a

Auto merge pull requests when all checks succeeded via WebUI (#19648 )

Add WebUI part of Auto merge feature

close #19621

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>

2022-06-11 16:44:20 +02:00

wxiaoguang

368baf9e77

Use Vue to refactor pull merge UI (#19650 )

* Use Vue to refactor pull merge UI

* add comments

* fix comments

* small fine tune

* fix tests

* adopt new pull default messages

* clean up

Co-authored-by: 6543 <6543@obermui.de>

2022-05-12 21:39:02 +08:00

3 Commits (3310dd1d197495fbfa2d7ee490e19e6d08e1d30f)