You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
7 years ago
..
view_content Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 7 years ago
branch_selector_field.tmpl hide branch on pull request view or create UI (#2454) 7 years ago
comment_tab.tmpl Ctrl + Enter to submit forms (#2540) 7 years ago
label_precolors.tmpl Indent all templates with tabs 9 years ago
labels.tmpl Added sorting to the labels & milestones page (#199) 8 years ago
list.tmpl Added progressbar for issues (#1146). (#3171) 7 years ago
milestone_new.tmpl #1146 finish new access rights for collaborators 8 years ago
milestones.tmpl Refactor struct's time to remove unnecessary memory usage (#3142) 7 years ago
navbar.tmpl Search bar for issues/pulls (#530) 8 years ago
new.tmpl Indent all templates with tabs 9 years ago
new_form.tmpl Responsive view (#2750) 7 years ago
search.tmpl Search bar for issues/pulls (#530) 8 years ago
view.tmpl Responsive view (#2750) 7 years ago
view_content.tmpl Responsive view (#2750) 7 years ago
view_title.tmpl Refactor struct's time to remove unnecessary memory usage (#3142) 7 years ago