parnic 35742d4af7 Reintroduce squash merge default comment as a config setting (#16134) ...

* Reinstate most of commit 09304db9a5d88c035a96f74a4544572bc8c5dac0

* Move the behaviour behind a config setting

* Also fix the initial #12365

2021-06-19 00:08:22 +02:00

..

check_test.go

Multiple Queue improvements: LevelDB Wait on empty, shutdown empty shadow level queue, reduce goroutines etc (#15693)

2021-05-15 16:22:26 +02:00

check.go

Remove unnecessary goroutine (#16080)

2021-06-09 15:52:55 -04:00

commit_status.go

[Refactor] CombinedStatus and CommitStatus related functions & structs (#14026)

2020-12-18 11:33:32 +08:00

lfs.go

Add LFS Migration and Mirror (#14726)

2021-04-08 18:25:57 -04:00

main_test.go

Move some pull request functions from models to services (#9266)

2019-12-06 21:44:10 -05:00

merge.go

Always set the merge base used to merge the commit (#15352)

2021-04-10 09:27:29 +01:00

patch.go

Make manual merge autodetection optional and add manual merge as merge method (#12543)

2021-03-03 22:41:23 -05:00

pull_test.go

Move PushToBaseRepo from models to services/pull (#9352)

2019-12-15 04:28:51 +01:00

pull.go

Reintroduce squash merge default comment as a config setting (#16134)

2021-06-19 00:08:22 +02:00

review.go

Add attachments for PR reviews (#16075)

2021-06-14 21:12:33 -04:00

temp_repo.go

Handle more pathological branch and tag names (#11843)

2020-06-11 19:49:47 -04:00

update.go

IsUserAllowedToUpdate ignore igonre if user is nil (#14885)

2021-03-04 19:27:54 +01:00