Steven 864e656d81 Display conflict-free merge messages for pull requests (#15773) ... Repositories using external issue tracker tend to use numeric issues in commits. To prevent conflicts during issue reference parsing or inside commit hooks, this change respects these configuration and uses the ! character to refer to pull requests in merge commit messages. For repositories using squash merges, this was already handled. Signed-off-by: JustusBunsi <61625851+justusbunsi@users.noreply.github.com> Co-authored-by: zeripath <art27@cantab.net>		2021-05-08 20:19:42 +01:00
..
fixtures	fix some ui bug about draft release (#15137)	2021-05-06 05:12:50 +02:00
migrations	Resolve panic on failed interface conversion in migration v156 (#15604)	2021-04-24 11:14:39 +08:00
access.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
access_test.go
action.go	add cron job to delete old actions from database (#15688)	2021-05-01 14:17:02 +02:00
action_list.go
action_test.go	Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999)	2021-02-19 22:36:43 +01:00
admin.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
admin_test.go
attachment.go	Add size to Save function (#15264)	2021-04-03 18:19:59 +02:00
attachment_test.go	Implement delete release attachments and update release attachments' name (#14130)	2021-03-23 00:09:51 +08:00
avatar.go	add /assets as root dir of public files (#15219)	2021-04-28 12:35:06 +00:00
avatar_test.go	add /assets as root dir of public files (#15219)	2021-04-28 12:35:06 +00:00
branches.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
branches_test.go
commit_status.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
commit_status_test.go	Fix bug about ListOptions and stars/watchers pagnation (#14556)	2021-02-04 11:23:46 -06:00
consistency.go	Fix orphaned objects deletion bug (#15657)	2021-04-30 20:08:46 +02:00
consistency_test.go	Fix orphaned objects deletion bug (#15657)	2021-04-30 20:08:46 +02:00
context.go
convert.go
error.go	rsponse 404 when delete not exist email (#15383)	2021-04-10 07:12:38 +01:00
error_oauth2.go
external_login_user.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
fixture_generation.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
fixture_test.go
gpg_key.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
gpg_key_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
helper.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
helper_directory.go
helper_environment.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_assignees.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_assignees_test.go
issue_comment.go	Refactor renders (#15175)	2021-04-19 18:25:08 -04:00
issue_comment_list.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_comment_test.go
issue_dependency.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_dependency_test.go
issue_label.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
issue_label_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_list.go	Performance improvement for list pull requests (#15447)	2021-04-15 19:34:43 +02:00
issue_list_test.go
issue_lock.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_milestone.go	Add dashboard milestone search and repo milestone search by name (#14866)	2021-04-08 13:53:59 +02:00
issue_milestone_test.go
issue_reaction.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_reaction_test.go
issue_stopwatch.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_stopwatch_test.go
issue_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_tracked_time.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_tracked_time_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_user.go
issue_user_test.go
issue_watch.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_watch_test.go
issue_xref.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
issue_xref_test.go
lfs.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
lfs_lock.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
list_options.go	Fix bug about ListOptions and stars/watchers pagnation (#14556)	2021-02-04 11:23:46 -06:00
log.go	Fix xorm log stack level (#15285)	2021-04-05 08:41:22 +01:00
login_source.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
main_test.go
migrate.go	Fix delete nonexist oauth application 500 and prevent deadlock (#15384)	2021-04-10 16:49:10 -04:00
models.go	Fix setting version table in dump (#15753)	2021-05-07 00:17:43 +01:00
models_test.go	Fix setting version table in dump (#15753)	2021-05-07 00:17:43 +01:00
notification.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
notification_test.go
oauth2.go	add /assets as root dir of public files (#15219)	2021-04-28 12:35:06 +00:00
oauth2_application.go	Fix delete nonexist oauth application 500 and prevent deadlock (#15384)	2021-04-10 16:49:10 -04:00
oauth2_application_test.go
org.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
org_team.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
org_team_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
org_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
project.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
project_board.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
project_issue.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
project_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
pull.go	Display conflict-free merge messages for pull requests (#15773)	2021-05-08 20:19:42 +01:00
pull_list.go
pull_sign.go
pull_test.go	Display conflict-free merge messages for pull requests (#15773)	2021-05-08 20:19:42 +01:00
release.go	Implement delete release attachments and update release attachments' name (#14130)	2021-03-23 00:09:51 +08:00
repo.go	Delete references if repository gets deleted (#15681)	2021-04-30 21:10:39 +02:00
repo_activity.go
repo_avatar.go
repo_branch.go
repo_collaboration.go
repo_collaboration_test.go
repo_generate.go	Refactor renders (#15175)	2021-04-19 18:25:08 -04:00
repo_generate_test.go
repo_indexer.go
repo_issue.go
repo_language_stats.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
repo_list.go	Disable Stars config option (#14653)	2021-04-15 18:53:57 +02:00
repo_list_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
repo_mirror.go	Add LFS Migration and Mirror (#14726)	2021-04-08 18:25:57 -04:00
repo_permission.go
repo_permission_test.go
repo_redirect.go	Redirect on changed user and org name (#11649)	2021-01-24 16:23:05 +01:00
repo_redirect_test.go	Redirect on changed user and org name (#11649)	2021-01-24 16:23:05 +01:00
repo_sign.go
repo_test.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
repo_transfer.go	Fix Migration 176 yet again (#15131)	2021-03-23 23:10:19 +00:00
repo_transfer_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
repo_unit.go	Add DefaultMergeStyle option to repository (#14789)	2021-03-27 15:55:40 +01:00
repo_watch.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
repo_watch_test.go
review.go	Ensure review dismissal only dismisses the correct review (#15477)	2021-04-15 11:03:11 +01:00
review_test.go	Ensure review dismissal only dismisses the correct review (#15477)	2021-04-15 11:03:11 +01:00
session.go	Fix DB session cleanup (#15697)	2021-05-01 22:51:03 -04:00
sql_postgres_with_schema.go
ssh_key.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
ssh_key_test.go
star.go
star_test.go
task.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
test_fixtures.go	Create Proper Migration Tests (#15116)	2021-03-24 19:27:22 +01:00
token.go
token_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
topic.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
topic_test.go
twofactor.go
u2f.go
u2f_test.go
unit.go
unit_tests.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
update.go
upload.go
user.go	Unified link creation. (#15619)	2021-04-30 19:25:13 +02:00
user_avatar.go	Send size to /avatars if requested (#15459)	2021-04-17 00:22:25 +02:00
user_follow.go
user_follow_test.go
user_heatmap.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
user_heatmap_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
user_mail.go	rsponse 404 when delete not exist email (#15383)	2021-04-10 07:12:38 +01:00
user_mail_test.go
user_openid.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
user_openid_test.go
user_redirect.go	Redirect on changed user and org name (#11649)	2021-01-24 16:23:05 +01:00
user_redirect_test.go	Redirect on changed user and org name (#11649)	2021-01-24 16:23:05 +01:00
user_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
userlist.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
userlist_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
webhook.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
webhook_test.go	chore(models): rewrite code format. (#14754)	2021-03-14 19:52:12 +01:00
wiki.go
wiki_test.go