diff options
| author | John Olheiser <42128690+jolheiser@users.noreply.github.com> | 2019-06-12 16:07:24 -0500 |
|---|---|---|
| committer | techknowlogick <hello@techknowlogick.com> | 2019-06-12 17:07:24 -0400 |
| commit | 8f0182c3229dfbb8d731557e5006e39bd616b4e9 (patch) | |
| tree | 3c8b8319980a19cb811acb2ffc5471b3ac71ff79 /modules/context | |
| parent | 744fd6a1c87f2ad39dbe282133fae1190df6e538 (diff) | |
| download | gitea-8f0182c3229dfbb8d731557e5006e39bd616b4e9.tar.gz gitea-8f0182c3229dfbb8d731557e5006e39bd616b4e9.zip | |
API error cleanup (#7186)
Diffstat (limited to 'modules/context')
| -rw-r--r-- | modules/context/api.go | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/modules/context/api.go b/modules/context/api.go index 61f6514759..9be3fb512c 100644 --- a/modules/context/api.go +++ b/modules/context/api.go @@ -7,14 +7,11 @@ package context import ( "fmt" - "net/url" - "path" "strings" "github.com/go-macaron/csrf" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" @@ -76,7 +73,7 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) { ctx.JSON(status, APIError{ Message: message, - URL: base.DocURL, + URL: setting.API.SwaggerURL, }) } @@ -180,15 +177,9 @@ func (ctx *APIContext) NotFound(objs ...interface{}) { } } - u, err := url.Parse(setting.AppURL) - if err != nil { - ctx.Error(500, "Invalid AppURL", err) - return - } - u.Path = path.Join(u.Path, "api", "swagger") ctx.JSON(404, map[string]interface{}{ "message": message, - "documentation_url": u.String(), + "documentation_url": setting.API.SwaggerURL, "errors": errors, }) } |