Merge branch 'master' of https://github.com/go-gitea/gitea into milestones

Author: bhalbright

.drone.yml

@@ -89,7 +89,6 @@ steps:
     commands:
       - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
       - make clean
-      - make generate
       - make golangci-lint
       - make revive
       - make swagger-check
@@ -389,12 +388,18 @@ steps:
     commands:
       - git fetch --tags --force
 
+  - name: build
+    pull: always
+    image: node:10 # this step is kept at the lowest version of node that we support
+    commands:
+      - make css
+      - make js
+
   - name: static
     pull: always
     image: techknowlogick/xgo:latest
     commands:
       - export PATH=$PATH:$GOPATH/bin
-      - make generate
       - make release
     environment:
       GOPROXY: off
@@ -491,12 +496,18 @@ steps:
     commands:
       - git fetch --tags --force
 
+  - name: build
+    pull: always
+    image: node:10 # this step is kept at the lowest version of node that we support
+    commands:
+      - make css
+      - make js
+
   - name: static
     pull: always
     image: techknowlogick/xgo:latest
     commands:
       - export PATH=$PATH:$GOPATH/bin
-      - make generate
       - make release
     environment:
       GOPROXY: off
@@ -650,8 +661,6 @@ steps:
         exclude:
         - pull_request
 
-
-
 ---
 kind: pipeline
 name: docker-linux-arm64
@@ -757,6 +766,9 @@ workspace:
   base: /go
   path: src/code.gitea.io/gitea
 
+clone:
+  disable: true
+
 when:
   status:
     - success

Makefile

@@ -397,7 +397,7 @@ $(EXECUTABLE): $(GO_SOURCES)
 	GO111MODULE=on $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
 
 .PHONY: release
-release: release-dirs release-windows release-linux release-darwin release-copy release-compress release-check
+release: generate release-dirs release-windows release-linux release-darwin release-copy release-compress release-check
 
 .PHONY: release-dirs
 release-dirs:

README.md

@@ -31,7 +31,7 @@ This project has been
 
 From the root of the source tree, run:
 
-    TAGS="bindata" make generate all
+    TAGS="bindata" make build
 
 More info: https://docs.gitea.io/en-us/install-from-source/
 

docs/content/doc/installation/from-source.en-us.md

@@ -106,8 +106,6 @@ To include assets, add the `bindata` tag:
 TAGS="bindata" make build
 ```
 
-WARNING: `generate` method is deprecated and using it may cause build to miss some static files.
-
 In the default release build of our continuous integration system, the build
 tags are: `TAGS="bindata sqlite sqlite_unlock_notify"`. The simplest
 recommended way to build from source is therefore:

docs/content/doc/installation/from-source.fr-fr.md

@@ -60,10 +60,10 @@ Comme nous regroupons déjà toutes les bibliothèques requises pour compiler Gi
 * `sqlite sqlite_unlock_notify`: Active la prise en charge d'une base de données [SQLite3](https://sqlite.org/), ceci n'est recommandé que pour les petites installations de Gitea.
 * `pam`: Active la prise en charge de PAM (mLinux Pluggable Authentication Modules), très utile si vos utilisateurs doivent être authentifiés avec les comptes du système.
 
-Il est temps de compiler le binaire, nous suggérons d'intégrer les ressources avec l'option de compilation `bindata`. Pour inclure les ressources, vous devrez également exécuter la tâche Make `generate`. Dans le cas échéant, les ressources ne pourront pas être intégrées:
+Il est temps de compiler le binaire, nous suggérons d'intégrer les ressources avec l'option de compilation `bindata`:
 
 ```
-TAGS="bindata" make generate build
+TAGS="bindata" make build
 ```
 
 ## Test

docs/content/doc/installation/from-source.zh-cn.md

@@ -66,8 +66,6 @@ git checkout v{{< version >}}
 TAGS="bindata" make build
 ```
 
-警告: `generate` 已经废弃，使用 `generate` 会导致资源文件打包失败。
-
 默认的发布版本中的编译选项是： `TAGS="bindata sqlite sqlite_unlock_notify"`。以下为推荐的编译方式：
 
 ```bash

docs/content/doc/installation/from-source.zh-tw.md

@@ -50,10 +50,10 @@ git checkout v{{< version >}}
 * `sqlite sqlite_unlock_notify`: 使用此標籤來啟用 [SQLite3](https://sqlite.org/) 資料庫，建議只有少數人時才使用此模式。
 * `pam`: 使用此標籤來啟用 PAM (Linux Pluggable Authentication Modules) 認證，對於系統使用者來說，此方式最方便了。
 
-現在您可以開始編譯執行檔了，我們建議使用 `bindata` 編譯選項，使用 `bindata` 選項前，您必須執行 `generate` 任務將所有資源都一起編譯進去，否則相關資源都不會被編譯進執行檔:
+現在您可以開始編譯執行檔了，我們建議使用 `bindata` 編譯選項:
 
 ```
-TAGS="bindata" make generate build
+TAGS="bindata" make build
 ```
 
 **注意**: 因為使用了套件管理工具，我們建議 Go 環境版本為 1.6 或者是更高，這樣不用在 Go 1.5 版本設定全域變數 `GO15VENDOREXPERIMENT`。

integrations/repo_search_test.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/models"
+	code_indexer "code.gitea.io/gitea/modules/indexer/code"
 	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/PuerkitoBio/goquery"
@@ -34,7 +35,7 @@ func TestSearchRepo(t *testing.T) {
 	repo, err := models.GetRepositoryByOwnerAndName("user2", "repo1")
 	assert.NoError(t, err)
 
-	executeIndexer(t, repo, models.UpdateRepoIndexer)
+	executeIndexer(t, repo, code_indexer.UpdateRepoIndexer)
 
 	testSearch(t, "/user2/repo1/search?q=Description&page=1", []string{"README.md"})
 
@@ -44,8 +45,8 @@ func TestSearchRepo(t *testing.T) {
 	repo, err = models.GetRepositoryByOwnerAndName("user2", "glob")
 	assert.NoError(t, err)
 
-	executeIndexer(t, repo, models.DeleteRepoFromIndexer)
-	executeIndexer(t, repo, models.UpdateRepoIndexer)
+	executeIndexer(t, repo, code_indexer.DeleteRepoFromIndexer)
+	executeIndexer(t, repo, code_indexer.UpdateRepoIndexer)
 
 	testSearch(t, "/user2/glob/search?q=loren&page=1", []string{"a.txt"})
 	testSearch(t, "/user2/glob/search?q=file3&page=1", []string{"x/b.txt"})

models/models.go

@@ -254,3 +254,28 @@ func MaxBatchInsertSize(bean interface{}) int {
 func Count(bean interface{}) (int64, error) {
 	return x.Count(bean)
 }
+
+// IsTableNotEmpty returns true if table has at least one record
+func IsTableNotEmpty(tableName string) (bool, error) {
+	return x.Table(tableName).Exist()
+}
+
+// DeleteAllRecords will delete all the records of this table
+func DeleteAllRecords(tableName string) error {
+	_, err := x.Exec(fmt.Sprintf("DELETE FROM %s", tableName))
+	return err
+}
+
+// GetMaxID will return max id of the table
+func GetMaxID(beanOrTableName interface{}) (maxID int64, err error) {
+	_, err = x.Select("MAX(id)").Table(beanOrTableName).Get(&maxID)
+	return
+}
+
+// FindByMaxID filled results as the condition from database
+func FindByMaxID(maxID int64, limit int, results interface{}) error {
+	return x.Where("id <= ?", maxID).
+		OrderBy("id DESC").
+		Limit(limit).
+		Find(results)
+}

models/repo.go

@@ -1112,10 +1112,6 @@ func MigrateRepositoryGitData(doer, u *User, repo *Repository, opts api.MigrateR
 		repo, err = CleanUpMigrateInfo(repo)
 	}
 
-	if err != nil && !repo.IsEmpty {
-		UpdateRepoIndexer(repo)
-	}
-
 	return repo, err
 }