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
..
admin	Change SSL Mode from checkbox to string in admin page (#3208)	2017-12-16 23:25:00 +02:00
base	Add more additional template snippets (#3286)	2018-01-02 11:32:41 +01:00
custom	Add more additional template snippets (#3286)	2018-01-02 11:32:41 +01:00
explore	Responsive view (#2750)	2017-12-30 18:47:52 -06:00
mail	Fix copy in email templates (#2801)	2017-10-29 23:57:05 +02:00
org	Fix avatar URLs (#3069)	2017-12-03 19:55:13 +08:00
repo	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
status	Change import reference to match gitea instead of gogs (#37)	2016-11-03 10:29:56 -02:00
user	Added progressbar for issues (#1146). (#3171)	2018-01-03 02:34:13 -06:00
home.tmpl	Spaces to tabs in templates (#2953)	2017-11-21 13:43:00 +08:00
install.tmpl	Spaces to tabs in templates (#2953)	2017-11-21 13:43:00 +08:00
swagger.tmpl	Spaces to tabs in templates (#2953)	2017-11-21 13:43:00 +08:00