diff options
| author | mscherer <mscherer@users.noreply.github.com> | 2021-11-27 12:59:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-27 19:59:51 +0800 |
| commit | 04c55e97a29dc9a60eafeccfb20d9f408c83ee46 (patch) | |
| tree | dd4f9c9de13ff97750fb643e6c83cb1db844fb02 | |
| parent | 2e8fc5b034d7a2ceb22f264193a157230b48365a (diff) | |
| download | gitea-04c55e97a29dc9a60eafeccfb20d9f408c83ee46.tar.gz gitea-04c55e97a29dc9a60eafeccfb20d9f408c83ee46.zip | |
Fix code formating (#17830)
* fix formatter, format imports first, then go fmt
| -rw-r--r-- | build/code-batch-process.go | 2 | ||||
| -rw-r--r-- | services/auth/signin.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build/code-batch-process.go b/build/code-batch-process.go index 4759baf906..fdc5d99b97 100644 --- a/build/code-batch-process.go +++ b/build/code-batch-process.go @@ -267,10 +267,10 @@ func main() { logVerbose("batch cmd: %s %v", subCmd, substArgs) switch subCmd { case "gitea-fmt": - cmdErrors = append(cmdErrors, passThroughCmd("gofmt", substArgs)) if containsString(subArgs, "-w") { cmdErrors = append(cmdErrors, giteaFormatGoImports(files)) } + cmdErrors = append(cmdErrors, passThroughCmd("gofmt", substArgs)) case "misspell": cmdErrors = append(cmdErrors, passThroughCmd("misspell", substArgs)) default: diff --git a/services/auth/signin.go b/services/auth/signin.go index 5f75000d98..80be419962 100644 --- a/services/auth/signin.go +++ b/services/auth/signin.go @@ -11,12 +11,12 @@ import ( "code.gitea.io/gitea/models/login" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/services/auth/source/oauth2" + "code.gitea.io/gitea/services/auth/source/smtp" _ "code.gitea.io/gitea/services/auth/source/db" // register the sources (and below) _ "code.gitea.io/gitea/services/auth/source/ldap" // register the ldap source - "code.gitea.io/gitea/services/auth/source/oauth2" - _ "code.gitea.io/gitea/services/auth/source/pam" // register the pam source - "code.gitea.io/gitea/services/auth/source/smtp" + _ "code.gitea.io/gitea/services/auth/source/pam" // register the pam source _ "code.gitea.io/gitea/services/auth/source/sspi" // register the sspi source ) |