From 2f39fc7bb6a17b4637b723026a2e18dafd1a0adb Mon Sep 17 00:00:00 2001
From: Cherrg <michael@gnehr.de>
Date: Thu, 13 Jun 2019 06:23:45 +0200
Subject: [PATCH] fix drone build bug (#7192)

---
 Makefile                     | 1 +
 public/less/_repository.less | 2 ++
 routers/user/oauth.go        | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d7f27a8a94..56fa863c8e 100644
--- a/Makefile
+++ b/Makefile
@@ -469,6 +469,7 @@ pr:
 .PHONY: golangci-lint
 golangci-lint:
 	@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; \
 	fi
 	golangci-lint run
diff --git a/public/less/_repository.less b/public/less/_repository.less
index fcc153e31e..71062bfa0e 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -1112,6 +1112,7 @@
         .show-form-container {
             text-align: left;
         }
+
         .choose.branch {
             .octicon {
                 padding-right: 10px;
@@ -2226,6 +2227,7 @@ tbody.commit-list {
     &.top {
         text-align: left;
     }
+
     .commit-body {
         margin: 0;
     }
diff --git a/routers/user/oauth.go b/routers/user/oauth.go
index aaad26201b..924bac8ef6 100644
--- a/routers/user/oauth.go
+++ b/routers/user/oauth.go
@@ -169,7 +169,7 @@ func AuthorizeOAuth(ctx *context.Context, form auth.AuthorizationForm) {
 		for _, e := range errs {
 			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
 	}