You can not 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
..
admin	Change SSL Mode from checkbox to string in admin page (#3208)	7 years ago
base	Add more additional template snippets (#3286)	7 years ago
custom	Add more additional template snippets (#3286)	7 years ago
explore	Responsive view (#2750)	7 years ago
mail	Fix copy in email templates (#2801)	7 years ago
org	Fix avatar URLs (#3069)	7 years ago
repo	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
status	Change import reference to match gitea instead of gogs (#37)	8 years ago
user	Added progressbar for issues (#1146). (#3171)	7 years ago
home.tmpl	Spaces to tabs in templates (#2953)	7 years ago
install.tmpl	Spaces to tabs in templates (#2953)	7 years ago
swagger.tmpl	Spaces to tabs in templates (#2953)	7 years ago