zeripath e5ded0ee19

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

Backport #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 18:54:13 +02:00

..

admin

Fix activation of primary email addresses (#16385)

2021-07-13 22:59:27 +02:00

dev

Refactor routers directory (#15800)

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

events

Refactor routers directory (#15800)

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

explore

Refactor routers directory (#15800)

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

org

Fix various documentation, user-facing, and source comment typos (#16367)

2021-07-08 13:38:13 +02:00

repo

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

2021-09-05 18:54:13 +02:00

user

Correctly return the number of Repositories for Organizations (#16807) (#16911)

2021-09-01 19:20:35 +02:00

base.go

Add sso.Group, context.Auth, context.APIAuth to allow auth special routes (#16086)

2021-06-09 19:53:16 +02:00

goget.go

Refactor routers directory (#15800)

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

home.go

Refactor routers directory (#15800)

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

metrics.go

Refactor routers directory (#15800)

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

swagger_json.go

Refactor routers directory (#15800)

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

web.go

Fix wiki raw commit diff/patch view (#16891) (#16892)

2021-08-31 14:13:08 +08:00