0
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-01 07:51:58 +01:00
gitea/templates/repo/issue
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
..
view_content Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
branch_selector_field.tmpl
comment_tab.tmpl Ctrl + Enter to submit forms (#2540) 2017-09-22 14:17:31 +08:00
label_precolors.tmpl
labels.tmpl
list.tmpl Added progressbar for issues (#1146). (#3171) 2018-01-03 02:34:13 -06:00
milestone_new.tmpl
milestones.tmpl Refactor struct's time to remove unnecessary memory usage (#3142) 2017-12-11 06:37:04 +02:00
navbar.tmpl
new_form.tmpl Responsive view (#2750) 2017-12-30 18:47:52 -06:00
new.tmpl
search.tmpl
view_content.tmpl Responsive view (#2750) 2017-12-30 18:47:52 -06:00
view_title.tmpl Refactor struct's time to remove unnecessary memory usage (#3142) 2017-12-11 06:37:04 +02:00
view.tmpl Responsive view (#2750) 2017-12-30 18:47:52 -06:00