diff options
| author | ususdei <ususdei@users.noreply.github.com> | 2018-06-26 14:49:46 +0200 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2018-06-26 20:49:46 +0800 |
| commit | cd71077c6acb52bf564ede19cf480fddfad72c05 (patch) | |
| tree | 20f4f65d9eb219c1ed30902d3628d0f3269bafa9 /conf/locale | |
| parent | 029b33c6508b9f320300e68e38184b2eb17ee1d5 (diff) | |
pull request: able to add custom commit description (#5276)
* pull request merges now allow for custom commit messages
* allow i18n on commit_message label
* place label above textarea for commit message
* rename commit message for pull requests into commit description and pass to git separately
Diffstat (limited to 'conf/locale')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index c17e2cac..c30d4454 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -640,6 +640,7 @@ pulls.cannot_auto_merge_desc = This pull request can't be merged automatically b pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts. pulls.create_merge_commit = Create a merge commit pulls.rebase_before_merging = Rebase before merging +pulls.commit_description = Commit Description pulls.merge_pull_request = Merge Pull Request pulls.open_unmerged_pull_exists = `You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.` pulls.delete_branch = Delete Branch |