gitea

Author	SHA1	Message	Date
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
Ethan Koenig	befa7445d2	Unit tests for routers/repo/issue_label (#3198 )	2017-12-15 23:11:02 +02:00
Lauris BH	240609432b	Issue content should not be updated when closing with comment (#2833 )	2017-11-03 17:23:17 +08:00
Lauris BH	c7f4f07765	Integration test for activity page (#2704 ) * Integration test for activity page * Small code refactoring for acitvity page * Move activity stats calculation logic to model	2017-10-16 00:54:53 +03:00