104 Commits

Author	SHA1	Message	Date
Julien Tant	ced08d18a4	fix IsPullReuqestBroken->IsPullRequestBroken (#4578) ... Signed-off-by: Julien Tant <julien@craftyx.fr>	2018-08-01 11:00:35 +08:00
Chri-s	a2a49c93c7	Added checks for protected branches in pull requests (#3544) ... * Added checks for protected branches in pull requests Signed-off-by: Christian Wulff <NChris@posteo.net> * Moved check for protected branch into new function CheckUserAllowedToMerge Signed-off-by: Christian Wulff <NChris@posteo.net> * Removed merge conflict lines from last commit Signed-off-by: Christian Wulff <NChris@posteo.net> * Explicit check for error type in ViewIssue Signed-off-by: Christian Wulff <NChris@posteo.net>	2018-03-13 11:46:14 +08:00
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
Kim "BKC" Carlbäcker	0693fbfc00	Refactor repo/issue/view_content.tmpl (#1276)	2017-03-17 13:57:43 +08:00