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	Enable admin to search by email (#2888)	7 years ago
api/v1	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
dev	Make time diff translatable (#2057)	8 years ago
org	Allow adding collaborators with (fullname) (#3103)	7 years ago
private	improve protected branch to add whitelist support (#2451)	7 years ago
repo	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
routes	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
user	Fix bugs in issue dashboard stats (#3073)	7 years ago
utils	Allow adding collaborators with (fullname) (#3103)	7 years ago
home.go	Add search mode option to /api/repo/search (#2756)	7 years ago
init.go	Set session and indexers' data files rel to AppDataPath (#2192)	7 years ago
install.go	Default log level to Info without hardcoding it in installer (#3041)	7 years ago