You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Lunny Xiao 4344a64107
Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177)
* Allow custom default merge message with .gitea/MERGE_MESSAGE_<merge_style>_TEMPLATE.md

* Some improvements

* Follow some advices

* Fix bug

* Fix bug

* Fix lint

* Fix close comment

* Fix test

* Fix and docs

* Improve codes

* Update docs and remove unnecessary variables

* return error for GetDefaultMergeMessage

* Fix test

* improve code

* ignore unknow unit type

* return error for GetDefaultMergeMessage

* Update services/pull/merge.go

* Some improvements

* Follow some advices

* Fix bug

* Fix lint

* Improve codes

* Update docs and remove unnecessary variables

* return error for GetDefaultMergeMessage

* improve code

* Handle deleted HeadRepo in GetDefaultMergeMessage

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Fix test

* Fix test

Co-authored-by: zeripath <art27@cantab.net>
2 years ago
..
branch Prevent double encoding of branch names in delete branch (#18714) 2 years ago
diff Allow to mark files in a PR as viewed (#19007) 2 years ago
editor Remove dependent on session auth for api/v1 routers (#19321) 2 years ago
graph Propagate context and ensure git commands run in request context (#17868) 2 years ago
issue Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177) 2 years ago
migrate Refactor repo clone button and repo clone links, fix JS error on empty repo page (#19208) 2 years ago
projects Move project files into models/project sub package (#17704) 2 years ago
pulls Improvements to content history (#17746) 3 years ago
release Remove dependent on session auth for api/v1 routers (#19321) 2 years ago
settings Update image URL for Discord webhook (#19536) 2 years ago
wiki By default force vertical tabs on mobile (#19486) 2 years ago
activity.tmpl Refactor i18n, use Locale to provide i18n/translation related functions (#18648) 2 years ago
blame.tmpl Add warning for BIDI characters in page renders and in diffs (#17562) 3 years ago
branch_dropdown.tmpl Fix broken TR on cherrypick page (#19599) 2 years ago
clone_buttons.tmpl Don't let repo clone URL overflow (#19517) 2 years ago
commit_page.tmpl Show fullname on issue edits and gpg/ssh signing info (#18827) 2 years ago
commit_status.tmpl Show dropdown with all statuses for commit (#13977) 4 years ago
commit_statuses.tmpl Separate the details links of commit-statuses in headers (#18661) 2 years ago
commits.tmpl Add compare tag dropdown to releases page (#15695) 3 years ago
commits_list.tmpl Refactor i18n, use Locale to provide i18n/translation related functions (#18648) 2 years ago
commits_list_small.tmpl Fix a broken link in `commits_list_small.tmpl` (#18763) 2 years ago
commits_table.tmpl Cleanup and use global style on popups (#17674) 3 years ago
create.tmpl Unify and simplify TrN for i18n (#18141) 3 years ago
empty.tmpl Refactor repo clone button and repo clone links, fix JS error on empty repo page (#19208) 2 years ago
forks.tmpl Add pagination to fork list (#17639) 3 years ago
graph.tmpl Re-separate the color translation strings (#17390) 3 years ago
header.tmpl By default force vertical tabs on mobile (#19486) 2 years ago
home.tmpl By default force vertical tabs on mobile (#19486) 2 years ago
icon.tmpl Do not display org avatar near icon for internal repos (#13957) 4 years ago
packages.tmpl Add Package Registry (#16510) 2 years ago
search.tmpl Automatically pause queue if index service is unavailable (#15066) 2 years ago
shabox_badge.tmpl Fix avatar template error (#13833) 4 years ago
sub_menu.tmpl Unify and simplify TrN for i18n (#18141) 3 years ago
unicode_escape_prompt.tmpl Left-Align text in Unicode warning boxes (#18331) 2 years ago
upload.tmpl Add attachments for PR reviews (#16075) 3 years ago
user_cards.tmpl Direct avatar rendering (#13649) 4 years ago
view_file.tmpl Add a new menu in file view to open blame view and fix blame view select range bug (#19500) 2 years ago
view_list.tmpl Update JS dependencies (#19281) 2 years ago
watchers.tmpl Add class to page content to unify top margin (#13766) 4 years ago