Lunny Xiao bf4badad1d Pull request conflict files detection (#5951) ... * add conflict detection * test pull request conflict files * fix detection files number * fix comments		2019-02-05 06:54:49 -05:00
..
activity.go
attachment.go
branch.go
commit.go
download.go
editor.go
editor_test.go
http.go	Feature: Archive repos (#5009)	2019-01-23 13:58:38 -05:00
issue.go	Automatically clear stopwatch on merging a PR (#4327)	2019-02-05 13:38:11 +02:00
issue_dependency.go
issue_label.go
issue_label_test.go
issue_stopwatch.go	Automatically clear stopwatch on merging a PR (#4327)	2019-02-05 13:38:11 +02:00
issue_timetrack.go
issue_watch.go
main_test.go
middlewares.go
milestone.go
pull.go	Pull request conflict files detection (#5951)	2019-02-05 06:54:49 -05:00
pull_review.go
release.go	Feature: Archive repos (#5009)	2019-01-23 13:58:38 -05:00
release_test.go
repo.go
search.go
setting.go	Fix ssh deploy and user key constraints (#1357) (#5939)	2019-02-03 23:56:53 +00:00
setting_protected_branch.go
settings_test.go
topic.go
view.go	Feature: Archive repos (#5009)	2019-01-23 13:58:38 -05:00
webhook.go
wiki.go	Feature: Archive repos (#5009)	2019-01-23 13:58:38 -05:00
wiki_test.go