Merge branch 'master' into Redirect-user-and-org-go-gitea#9531

AndrewBezold · Jan 23, 2021 · cd4c6eb · cd4c6eb
2 parents 0167007 + 9872b8d
commit cd4c6eb
Show file tree

Hide file tree

Showing 4,969 changed files with 522,131 additions and 212,168 deletions.
diff --git a/.air.conf b/.air.conf
@@ -0,0 +1,9 @@
+root = "."
+tmp_dir = ".air"
+
+[build]
+cmd = "make backend"
+bin = "gitea"
+include_ext = ["go", "tmpl"]
+exclude_dir = ["modules/git/tests", "services/gitdiff/testdata", "modules/avatar/testdata"]
+include_dir = ["cmd", "models", "modules", "options", "routers", "services", "templates"]
diff --git a/.changelog.yml b/.changelog.yml
@@ -22,6 +22,10 @@ groups:
     name: SECURITY
     labels:
       - kind/security
+  -
+    name: API
+    labels:
+      - kind/api
   -
     name: BUGFIXES
     labels: