aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-04 08:17:24 -05:00
Code
8ef1711055
gitea/templates/repo/settings
History
Lauris BH 8ac1501ad7
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
2018-01-05 20:56:50 +02:00
..
branches.tmpl improve protected branch to add whitelist support (#2451) 2017-09-14 16:16:22 +08:00
collaboration.tmpl Use Semantic UI's Search component for user and repo search (#2636) 2017-10-03 06:27:48 +03:00
deploy_keys.tmpl Refactor struct's time to remove unnecessary memory usage (#3142) 2017-12-11 06:37:04 +02:00
githook_edit.tmpl Cleaner ui for admin, repo settings, and user settings page (#1269) (#1270) 2017-03-15 23:39:38 +01:00
githooks.tmpl Fix #1418 (#1456) 2017-04-07 22:50:40 +08:00
hook_delete_modal.tmpl Indent all templates with tabs 2015-12-08 00:57:46 +01:00
hook_dingtalk.tmpl Add dingtalk webhook (#2777) 2017-11-21 06:26:43 +02:00
hook_discord.tmpl Implementation of discord webhook (#2402) 2017-08-28 13:06:45 +08:00
hook_gitea.tmpl fix webhook link 2017-08-11 03:45:54 +02:00
hook_gogs.tmpl fix webhook link 2017-08-11 03:45:54 +02:00
hook_history.tmpl Fix #1418 (#1456) 2017-04-07 22:50:40 +08:00
hook_list.tmpl Add dingtalk webhook (#2777) 2017-11-21 06:26:43 +02:00
hook_new.tmpl Add dingtalk webhook (#2777) 2017-11-21 06:26:43 +02:00
hook_settings.tmpl Webhooks for repo creation/deletion (#1663) 2017-09-03 11:20:24 +03:00
hook_slack.tmpl Fixed project on repo template hook settings 2016-12-02 07:46:02 +01:00
hooks.tmpl Cleaner ui for admin, repo settings, and user settings page (#1269) (#1270) 2017-03-15 23:39:38 +01:00
nav.tmpl Protected branches system (#339) 2017-02-21 23:02:10 +08:00
navbar.tmpl Cleaner ui for admin, repo settings, and user settings page (#1269) (#1270) 2017-03-15 23:39:38 +01:00
options.tmpl Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
protected_branch.tmpl improve protected branch to add whitelist support (#2451) 2017-09-14 16:16:22 +08:00