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	branch: Trigger update when deleting branch via UI. (#5617)	2019-01-02 20:56:58 +08:00
commit.go	fix commit page showing status for current default branch (#5650)	2019-01-06 16:32:00 +02:00
download.go	…
editor.go	SECURITY: protect DeleteFilePost et al with cleanUploadFileName (#5631)	2019-01-04 11:08:26 -05:00
editor_test.go	fix bug on upload file name (#5571)	2018-12-20 21:32:11 -05:00
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	Issue is not overdue when it is on the same date #5566 (#5568)	2019-01-01 18:56:47 +01:00
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	Refactor repo.isBare to repo.isEmpty #5629 (#5714)	2019-01-17 19:01:04 -05:00
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	Improve wiki test (#3493)	2018-02-13 11:19:49 +02:00