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	hide branch on pull request view or create UI (#2454)	2017-09-06 15:02:51 +03:00
comment_tab.tmpl	Ctrl + Enter to submit forms (#2540)	2017-09-22 14:17:31 +08:00
label_precolors.tmpl	Indent all templates with tabs	2015-12-08 00:57:46 +01:00
labels.tmpl	Added sorting to the labels & milestones page (#199)	2016-12-24 22:41:09 +08:00
list.tmpl	Added progressbar for issues (#1146). (#3171)	2018-01-03 02:34:13 -06:00
milestone_new.tmpl	#1146 finish new access rights for collaborators	2016-03-05 20:45:23 -05:00
milestones.tmpl	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
navbar.tmpl	Search bar for issues/pulls (#530)	2017-01-25 10:43:02 +08:00
new.tmpl	Indent all templates with tabs	2015-12-08 00:57:46 +01:00
new_form.tmpl	Responsive view (#2750)	2017-12-30 18:47:52 -06:00
search.tmpl	Search bar for issues/pulls (#530)	2017-01-25 10:43:02 +08:00
view.tmpl	Responsive view (#2750)	2017-12-30 18:47:52 -06:00
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