mirror
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
gitea/models
History
zeripath 76d6184cd0
Display conflict-free merge messages for pull requests (#15773) (#15796) 
Backport #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>

Co-authored-by: Steven <61625851+justusbunsi@users.noreply.github.com>
 		2021-05-09 10:32:48 +08:00
..
fixtures fix some ui bug about draft release (#15137) (#15745) 2021-05-06 21:23:26 +02:00
migrations Resolve panic on failed interface conversion in migration v156 (#15604) (#15610) 2021-04-25 11:58:42 -04:00
access.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
access_test.go
…
action.go Fix timezone bug when clicking heatmap (#15141) (#15231) 2021-04-01 18:22:54 +08: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 Implement delete release attachments and update release attachments' name (#14130) (#15666) 2021-05-03 13:27:00 -04:00
attachment_test.go Implement delete release attachments and update release attachments' name (#14130) (#15666) 2021-05-03 13:27:00 -04:00
avatar.go Send size to /avatars if requested (#15459) (#15528) 2021-04-17 12:30:58 +01:00
avatar_test.go Direct avatar rendering (#13649) 2020-12-03 19:46:11 +01:00
branches.go Add dismiss review feature (#12674) 2021-02-11 18:32:25 +01: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) (#15683) 2021-04-30 22:27:26 +01:00
consistency_test.go Fix orphaned objects deletion bug (#15657) (#15683) 2021-04-30 22:27:26 +01:00
context.go
…
convert.go
…
error.go Ensure validation occurs on clone addresses too (#14994) 2021-03-15 17:52:11 -04: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 chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01: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 Delete Labels & IssueLabels on Repo Delete too (#15039) 2021-03-19 21:01:24 +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) (#15500) 2021-04-16 01:14:14 +03: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 chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01: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 chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01: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) (#15316) 2021-04-07 08:36:15 +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) (#15396) 2021-04-11 04:57:44 +02:00
models.go Fix setting version table in dump (#15753) (#15759) 2021-05-07 14:04:17 +02:00
models_test.go Fix setting version table in dump (#15753) (#15759) 2021-05-07 14:04:17 +02:00
notification.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
notification_test.go
…
oauth2.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
oauth2_application.go Fix delete nonexist oauth application 500 and prevent deadlock (#15384) (#15396) 2021-04-11 04:57:44 +02:00
oauth2_application_test.go Minimal OpenID Connect implementation (#14139) 2021-01-02 00:33:27 +08:00
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) (#15796) 2021-05-09 10:32:48 +08:00
pull_list.go
…
pull_sign.go
…
pull_test.go Display conflict-free merge messages for pull requests (#15773) (#15796) 2021-05-09 10:32:48 +08:00
release.go Implement delete release attachments and update release attachments' name (#14130) (#15666) 2021-05-03 13:27:00 -04:00
repo.go Delete references if repository gets deleted (#15681) (#15684) 2021-05-01 00:09:58 +02:00
repo_activity.go
…
repo_avatar.go Avatars and Repo avatars support storing in minio (#12516) 2020-10-14 21:07:51 +08:00
repo_branch.go
…
repo_collaboration.go
…
repo_collaboration_test.go
…
repo_generate.go Fix broken migration on webhook (#13911) 2020-12-09 17:20:13 +00: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 Improve /api/v1/repos/issues/search by just getting repo ids (#15179) (#15192) 2021-04-01 01:15:08 +02:00
repo_list_test.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
repo_mirror.go
…
repo_permission.go ui: show 'owner' tag for real owner (#13689) 2020-11-28 17:52:29 +02:00
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 chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
repo_transfer.go Fix Migration 176 yet again (#15132) 2021-03-23 23:18:05 +00:00
repo_transfer_test.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
repo_unit.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +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) (#15489) 2021-04-15 18:24:59 +03:00
review_test.go Ensure review dismissal only dismisses the correct review (#15477) (#15489) 2021-04-15 18:24:59 +03:00
session.go Fix DB session cleanup (#15697) (#15700) 2021-05-02 10:43:01 +01:00
sql_postgres_with_schema.go Ensure that schema search path is set with every connection on postgres (#14131) 2021-01-02 10:07:43 +08:00
ssh_key.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
ssh_key_test.go Add support for ed25519_sk and ecdsa_sk SSH keys (#13462) 2021-01-20 20:36:55 +00:00
star.go
…
star_test.go
…
task.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
test_fixtures.go
…
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 Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186) 2020-11-27 21:42:08 -05:00
user.go Fix `admin user list` (#15358) (#15359) 2021-04-09 12:39:40 +02:00
user_avatar.go Send size to /avatars if requested (#15459) (#15528) 2021-04-17 12:30:58 +01:00
user_follow.go
…
user_follow_test.go
…
user_heatmap.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
user_heatmap_test.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
user_mail.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01:00
user_mail_test.go
…
user_openid.go chore(models): rewrite code format. (#14754) 2021-03-14 19:52:12 +01: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 Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186) 2020-11-27 21:42:08 -05:00
wiki_test.go
…