patchii/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
forgejo/templates/repo
History
Max Wipfli 4ddd9af50f
Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 
This PR introduces the `ReviewedOn` and `ReviewedBy` variables for the
default merge message templates (e.g.,
`.gitea/default_merge_message/MERGE_TEMPLATE.md`).

This allows customizing the default merge messages while retaining these
trailers.

This also moves the associated logic out of `pull.tmpl` into the
relevant Go function.

This is a first contribution towards #11077.

---

For illustration, this allows to recreate the "default default" merge
message with the following template:
```
.gitea/default_merge_message/MERGE_TEMPLATE.md
Merge pull request '${PullRequestTitle}' (${PullRequestReference}) from ${HeadBranch} into ${BaseBranch}

${ReviewedOn}
${ReviewedBy}
```

(cherry picked from commit da4bbc42477ba04d175cc0775a0c5ec90c4c24fe)

Conflicts:
	docs/content/usage/merge-message-templates.en-us.md
	not in Forgejo
	templates/repo/issue/view_content/pull.tmpl
	trivial context conflict
2024-06-09 16:04:57 +02:00
..
actions UI: Actions: Replace runs list description semicolon 2024-04-29 21:05:20 +02:00
branch Don't include link of deleted branch when listing branches (#31028) 2024-05-26 18:45:23 +02:00
cite Fix Citation modal responsiveness and clipboard copy (#29799) 2024-03-20 08:46:29 +01:00
code Fix overflow on push notification (#31179) 2024-06-09 11:13:39 +02:00
diff Prevent simultaneous editing of comments and issues (#31053) 2024-06-02 16:26:54 +02:00
editor Convert max file name length to 255 (#30489) 2024-04-21 11:53:41 +02:00
find Migrate gt-hidden to tw-hidden (#30046) 2024-03-30 07:17:29 +01:00
graph Fix DEFAULT_SHOW_FULL_NAME=false has no effect in commit list and commit graph page (#30096) 2024-04-07 10:52:45 +02:00
issue Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-09 16:04:57 +02:00
migrate Fix and improve repo visibility checkbox when FORCE_PRIVATE is on (#3786) 2024-05-16 05:51:55 +00:00
projects Migrate margin and padding helpers to tailwind (#30043) 2024-03-30 07:17:29 +01:00
pulls Improve diff stats bar (#30669) 2024-04-28 15:39:01 +02:00
release [FEAT]Add Option to hide Release Archive links (#3139) 2024-04-24 15:15:55 +00:00
settings feat(federated-star) star repositories via ActivityPub (#1680) 2024-06-06 08:58:11 +02:00
tag Adjust the signed tag verification line 2024-04-02 23:02:34 +02:00
wiki feat: wiki search using git-grep 2024-05-20 13:48:50 +00:00
activity.tmpl Show repo activities even if only code unit active or git repo is empty but issue is active (#3455) 2024-04-28 13:47:52 +00:00
admin_flags.tmpl
blame.tmpl Fix border-radius on view, blame and code search (#30545) 2024-04-21 16:28:16 +02:00
branch_dropdown.tmpl Fix long branch name overflows (https://github.com/go-gitea/gitea/pull/30345) 2024-05-24 22:11:37 +05:00
clone_buttons.tmpl Refactor clone-panel styles (#29861) 2024-03-26 19:04:24 +01:00
clone_script.tmpl Customizable "Open with" applications for repository clone (#29320) 2024-03-23 11:58:54 +01:00
code_frequency.tmpl
commit_load_branches_and_tags.tmpl Migrate gt-hidden to tw-hidden (#30046) 2024-03-30 07:17:29 +01:00
commit_page.tmpl Various improvements for long file and commit names (#30374) 2024-04-15 20:01:35 +02:00
commit_status.tmpl
commit_statuses.tmpl Replace 10 more gt- classes with tw- (#29945) 2024-03-26 19:04:27 +01:00
commits.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-30 07:17:29 +01:00
commits_list.tmpl [PORT] gitea#30396: Fix author name alignment in commits table 2024-04-15 20:09:34 +02:00
commits_list_small.tmpl Fix some UI regressions for commit list (#30920) 2024-05-12 20:03:10 +02:00
commits_search_dropdown.tmpl Unify search boxes (#29530) 2024-03-20 12:31:05 +00:00
commits_table.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-30 07:17:29 +01:00
contributors.tmpl
create.tmpl Fix and improve repo visibility checkbox when FORCE_PRIVATE is on (#3786) 2024-05-16 05:51:55 +00:00
create_helper.tmpl Remove incorrect and unnecessary Escape from templates (#29394) 2024-02-26 22:30:27 +01:00
empty.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-30 07:17:29 +01:00
file_info.tmpl Remove obsolete CSS text classes (#30576) 2024-04-28 15:39:00 +02:00
flags.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-30 07:17:29 +01:00
forks.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-30 07:17:29 +01:00
graph.tmpl Migrate gt-hidden to tw-hidden (#30046) 2024-03-30 07:17:29 +01:00
header.tmpl Rename project board -> column to make the UI less confusing (#30170) 2024-06-02 09:42:39 +02:00
header_fork.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-30 07:17:29 +01:00
home.tmpl [FEAT] support searching non default branches/tags when using git-grep (#3654) 2024-05-14 15:41:03 +00:00
icon.tmpl Replace 10 more gt- classes with tw- (#29945) 2024-03-26 19:04:27 +01:00
latest_commit.tmpl Fix DEFAULT_SHOW_FULL_NAME=false has no effect in commit list and commit graph page (#30096) 2024-04-07 10:52:45 +02:00
navbar.tmpl Implement recent commits graph (#29210) 2024-02-26 22:30:26 +01:00
packages.tmpl
pulse.tmpl Pulse page improvements (#30149) 2024-04-21 11:08:33 +02:00
recent_commits.tmpl Implement recent commits graph (#29210) 2024-02-26 22:30:26 +01:00
release_tag_header.tmpl Fix localization of release/tag counters on releases page 2024-05-29 22:46:36 +05:00
search.tmpl Unify search boxes (#29530) 2024-03-20 12:31:05 +00:00
search_name.tmpl
shabox_badge.tmpl
star_unstar.tmpl Further consistency in the repo header 2024-03-27 09:33:06 +01:00
sub_menu.tmpl Rename ByteSize to ReadableSize 2024-03-31 20:17:12 +05:00
unicode_escape_prompt.tmpl templates: remove superfluous SanitizeHTML 2024-03-11 23:36:58 +07:00
upload.tmpl
user_cards.tmpl
view_file.tmpl Fix border-radius on view, blame and code search (#30545) 2024-04-21 16:28:16 +02:00
view_list.tmpl Fix view of readme file in the home code page. (#30564) 2024-04-28 15:39:01 +02:00
watch_unwatch.tmpl Further consistency in the repo header 2024-03-27 09:33:06 +01:00
watchers.tmpl