From 50ec30e0f2aea52a09924c86d6ba59e3404035a1 Mon Sep 17 00:00:00 2001
From: Gusted <williamzijl7@hotmail.com>
Date: Sat, 22 Jan 2022 16:13:17 +0100
Subject: [PATCH 1/2] Make gitea, gitea-vet future-proof

- Ref: https://gitea.com/gitea/gitea-vet/pulls/18
---
 CONTRIBUTING.md      | 2 +-
 modules/json/json.go | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 624896bbaacd2..a8312f219d15a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,7 +141,7 @@ For imports you should use the following format (_without_ the comments)
 ```go
 import (
   // stdlib
-  "encoding/json"
+  "math"
   "fmt"
 
   // local packages
diff --git a/modules/json/json.go b/modules/json/json.go
index 1cbb6582610df..3afa86023c6f8 100644
--- a/modules/json/json.go
+++ b/modules/json/json.go
@@ -4,6 +4,7 @@
 
 package json
 
+// Allow "encoding/json" import.
 import (
 	"bytes"
 	"encoding/binary"

From cf94356f4000c41ae5469a89d12c902c921878c5 Mon Sep 17 00:00:00 2001
From: Gusted <williamzijl7@hotmail.com>
Date: Sat, 22 Jan 2022 16:19:09 +0100
Subject: [PATCH 2/2] Correct order

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a8312f219d15a..b9de6b69970c2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,8 +141,8 @@ For imports you should use the following format (_without_ the comments)
 ```go
 import (
   // stdlib
-  "math"
   "fmt"
+  "math"
 
   // local packages
   "code.gitea.io/gitea/models"