foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 12:54:53 -05:00
Code Issues Wiki Activity

fix drone build bug (#7192)

Browse source
This commit is contained in:
Cherrg 2019-06-13 06:23:45 +02:00 committed by techknowlogick
parent 8f0182c322
commit 2f39fc7bb6
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -469,6 +469,7 @@ pr:
.PHONY: golangci-lint .PHONY: golangci-lint
golangci-lint: golangci-lint:
@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
export BINARY="golangci-lint"; \
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.16.0; \ curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.16.0; \
fi fi
golangci-lint run golangci-lint run

2
public/less/_repository.less
View file

@ -1112,6 +1112,7 @@
.show-form-container { .show-form-container {
text-align: left; text-align: left;
} }
.choose.branch { .choose.branch {
.octicon { .octicon {
padding-right: 10px; padding-right: 10px;
@ -2226,6 +2227,7 @@ tbody.commit-list {
&.top { &.top {
text-align: left; text-align: left;
} }
.commit-body { .commit-body {
margin: 0; margin: 0;
} }

2
routers/user/oauth.go
View file

@ -169,7 +169,7 @@ func AuthorizeOAuth(ctx *context.Context, form auth.AuthorizationForm) {
for _, e := range errs { for _, e := range errs {
errstring += e.Error() + "\n" errstring += e.Error() + "\n"
} }
ctx.ServerError("AuthorizeOAuth: Validate: ", fmt.Errorf("errors occured during validation: %s", errstring)) ctx.ServerError("AuthorizeOAuth: Validate: ", fmt.Errorf("errors occurred during validation: %s", errstring))
return return
} }