diff options
| author | Lauris BH <lauris@nix.lv> | 2018-01-05 20:56:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 20:56:50 +0200 |
| commit | 8ac1501ad7f8b350bd9c1bf01b25f994fd3560f9 (patch) | |
| tree | cf9b661996134da3e39aa6ddd2af4e13f7dbf30f /options | |
| parent | a192f3052ed9b59d1404fdcebf2b5c156d6d6969 (diff) | |
| download | gitea-8ac1501ad7f8b350bd9c1bf01b25f994fd3560f9.tar.gz gitea-8ac1501ad7f8b350bd9c1bf01b25f994fd3560f9.zip | |
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)
* Pull request options migration and UI in settings
* Add ignore whitespace functionality
* Fix settings if pull requests are disabled
* Fix migration transaction
* Merge with Rebase functionality
* UI changes and related functionality for pull request merging button
* Implement squash functionality
* Fix rebase merging
* Fix pull request merge tests
* Add squash and rebase tests
* Fix API method to reuse default message functions
* Some refactoring and small fixes
* Remove more hardcoded values from tests
* Remove unneeded check from API method
* Fix variable name and comment typo
* Fix reset commit count after PR merge
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4e1cf42ddb..4344a65774 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -755,7 +755,12 @@ pulls.is_checking = "The conflict checking is still in progress; please refresh pulls.can_auto_merge_desc = This pull request can be merged automatically. pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically because there are conflicts. pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts. +pulls.no_merge_desc = This pull request can not be merged as no merge options are enabled. +pulls.no_merge_helper = To merge this pull request enable at least one merge option in repository settings or merge pull request manually. pulls.merge_pull_request = Merge Pull Request +pulls.rebase_merge_pull_request = Rebase and Merge +pulls.squash_merge_pull_request = Squash and Merge +pulls.invalid_merge_option = You can not use this merge option for this pull request pulls.open_unmerged_pull_exists = `You cannot perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.` milestones.new = New Milestone @@ -894,6 +899,10 @@ settings.tracker_url_format_desc = You can use placeholder <code>{user} {repo} { settings.enable_timetracker = Enable time tracker settings.allow_only_contributors_to_track_time = Allow only contributors to track time settings.pulls_desc = Enable pull requests to accept public contributions +settings.pulls.ignore_whitespace = Ignore changes in whitespace when checking conflicts +settings.pulls.allow_merge_commits = Allow merge commits +settings.pulls.allow_rebase_merge = Allow rebase to merge commits +settings.pulls.allow_squash_commits = Allow to squash commits before merging settings.danger_zone = Danger Zone settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name. settings.convert = Convert To Regular Repository |