zeripath eb0330a3fe

Ensure that rebase conflicts are handled in updates (#16952) ...

PR #16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.

Fix #16922

Signed-off-by: Andrew Thornton <art27@cantab.net>

2021-09-05 10:30:40 +01:00

..

activity.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

attachment.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

blame.go

Replace list.List with slices (#16311)

2021-08-09 14:08:51 -04:00

branch.go

Fix branch pagination error (#16805)

2021-08-24 23:15:07 +01:00

commit.go

Repare and Improve GetDiffRangeWithWhitespaceBehavior (#16894)

2021-08-31 06:16:23 +02:00

compare.go

Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899)

2021-08-31 08:43:31 +01:00

download.go

Download lfs in git and web workflow from minio/s3 directly (#16731)

2021-08-21 20:22:06 +02:00

editor_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

editor.go

Pre-fill suggested New File 'name' and 'content' with Query Params (#16556)

2021-07-29 05:39:46 +02:00

http_test.go

Fix http path bug (#16117)

2021-06-09 14:53:12 +02:00

http.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

issue_dependency.go

Rename context.Query to context.Form (#16562)

2021-07-29 03:42:15 +02:00

issue_label_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_label.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

issue_lock.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_stopwatch.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_timetrack.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_watch.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue.go

Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899)

2021-08-31 08:43:31 +01:00

lfs.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

main_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

middlewares.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

migrate.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

milestone.go

In Render tolerate not being passed a context (#16842)

2021-08-28 21:15:56 +01:00

projects_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

projects.go

In Render tolerate not being passed a context (#16842)

2021-08-28 21:15:56 +01:00

pull_review.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

pull.go

Ensure that rebase conflicts are handled in updates (#16952)

2021-09-05 10:30:40 +01:00

release_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

release.go

Paginate releases page & set default page size to 10 (#16857)

2021-08-29 18:25:16 +02:00

repo.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

search.go

Related refactors to ctx.FormX functions (#16567)

2021-08-11 18:08:52 +03:00

setting_protected_branch.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

setting.go

Add missing return to handleSettingRemoteAddrError (#16794)

2021-08-23 18:09:25 -04:00

settings_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

tag.go

Rename context.Query to context.Form (#16562)

2021-07-29 03:42:15 +02:00

topic.go

Related refactors to ctx.FormX functions (#16567)

2021-08-11 18:08:52 +03:00

view.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

webhook.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

wiki_test.go

Add TestPrepareWikiFileName (#16487)

2021-07-20 15:16:20 +02:00

wiki.go

Ensure wiki repos are all closed (#16886)

2021-08-30 22:50:35 +02:00