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

Restrict permission check on repositories and fix some problems (#5314)

2018-11-28 19:26:14 +08:00

attachment.go

Log attachment blocked events (#3615)

2018-03-05 08:51:10 +08:00

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

Add raw blob endpoint to get objects by SHA ID (#5334)

2018-11-18 13:45:40 -05:00

editor_test.go

fix bug on upload file name (#5571)

2018-12-20 21:32:11 -05:00

editor.go

SECURITY: protect DeleteFilePost et al with cleanUploadFileName (#5631)

2019-01-04 11:08:26 -05:00

http.go

Feature: Archive repos (#5009)

2019-01-23 13:58:38 -05:00

issue_dependency.go

Added dependencies for issues (#2196) (#2531)

2018-07-17 17:23:58 -04:00

issue_label_test.go

fix go vet error (#3740)

2018-03-30 07:21:27 +08:00

issue_label.go

Add label descriptions (#3662)

2018-03-13 10:03:55 +08:00

issue_stopwatch.go

Automatically clear stopwatch on merging a PR (#4327)

2019-02-05 13:38:11 +02:00

issue_timetrack.go

Handle refactor (#3339)

2018-01-10 23:34:17 +02:00

issue_watch.go

Restrict permission check on repositories and fix some problems (#5314)

2018-11-28 19:26:14 +08:00

issue.go

Automatically clear stopwatch on merging a PR (#4327)

2019-02-05 13:38:11 +02:00

main_test.go

Unit tests for wiki routers (#3022)

2017-11-30 17:52:15 +02:00

middlewares.go

Add whitespace handling to PR-comparsion (#4683)

2018-08-14 13:49:33 -04:00

milestone.go

Issue is not overdue when it is on the same date #5566 (#5568)

2019-01-01 18:56:47 +01:00

pull_review.go

Add comment replies (#5104)

2018-10-22 16:13:35 -04:00

pull.go

Pull request conflict files detection (#5951)

2019-02-05 06:54:49 -05:00

release_test.go

Fix missing branch in release bug (#3108)

2017-12-08 13:22:02 +08:00

release.go

Feature: Archive repos (#5009)

2019-01-23 13:58:38 -05:00

repo.go

Refactor repo.isBare to repo.isEmpty #5629 (#5714)

2019-01-17 19:01:04 -05:00

search.go

Global code search support (#3664)

2018-03-16 22:04:33 +08:00

setting_protected_branch.go

Approvals at Branch Protection (#5350)

2018-12-11 19:28:37 +08:00

setting.go

Fix ssh deploy and user key constraints (#1357) (#5939)

2019-02-03 23:56:53 +00:00

settings_test.go

An inactive user shouldn't be able to be added as a collaborator (#4535)

2018-08-07 13:01:06 +03:00

topic.go

Fix topics addition (Another solution) (#4031) (#4258)

2018-06-21 17:09:46 +08:00

view.go

Feature: Archive repos (#5009)

2019-01-23 13:58:38 -05:00

webhook.go

Slack webhook channel name cannot be empty or just contain an hashtag (#4786)

2018-09-10 10:31:08 -04:00

wiki_test.go

Improve wiki test (#3493)

2018-02-13 11:19:49 +02:00

wiki.go

Feature: Archive repos (#5009)

2019-01-23 13:58:38 -05:00