Merge branch 'master' into exclude_label

models/issue_label.go

@@ -61,18 +61,18 @@ func GetLabelTemplateFile(name string) ([][3]string, error) {
 
 // Label represents a label of repository for issues.
 type Label struct {
-	ID              int64 `xorm:"pk autoincr"`
-	RepoID          int64 `xorm:"INDEX"`
+	ID              int64  `xorm:"pk autoincr"`
+	RepoID          int64  `xorm:"INDEX"`
 	Name            string
 	Description     string
 	Color           string `xorm:"VARCHAR(7)"`
 	NumIssues       int
 	NumClosedIssues int
-	NumOpenIssues   int  `xorm:"-"`
-	IsChecked       bool `xorm:"-"`
-	QueryString     string
-	IsSelected      bool
-	IsExcluded      bool `xorm:"-"`
+	NumOpenIssues   int    `xorm:"-"`
+	IsChecked       bool   `xorm:"-"`
+	QueryString     string `xorm:"-"`
+	IsSelected      bool   `xorm:"-"`
+	IsExcluded      bool   `xorm:"-"`
 }
 
 // APIFormat converts a Label to the api.Label format

models/migrations/migrations.go

@@ -262,6 +262,8 @@ var migrations = []Migration{
 	NewMigration("update migration repositories' service type", dropColumnHeadUserNameOnPullRequest),
 	// v103 -> v104
 	NewMigration("Add WhitelistDeployKeys to protected branch", addWhitelistDeployKeysToBranches),
+	// v104 -> v105
+	NewMigration("remove unnecessary columns from label", removeLabelUneededCols),
 }
 
 // Migrate database to current version

models/migrations/v104.go

@@ -0,0 +1,34 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"xorm.io/xorm"
+)
+
+func removeLabelUneededCols(x *xorm.Engine) error {
+
+	// Make sure the columns exist before dropping them
+	type Label struct {
+		QueryString string
+		IsSelected  bool
+	}
+	if err := x.Sync2(new(Label)); err != nil {
+		return err
+	}
+
+	sess := x.NewSession()
+	defer sess.Close()
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+	if err := dropTableColumns(sess, "label", "query_string"); err != nil {
+		return err
+	}
+	if err := dropTableColumns(sess, "label", "is_selected"); err != nil {
+		return err
+	}
+	return sess.Commit()
+}

options/locale/locale_es-ES.ini

@@ -77,7 +77,7 @@ loading=Cargando…
 app_desc=Un servicio de Git autoalojado y sin complicaciones
 install=Fácil de instalar
 install_desc=Simplemente <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/install-from-binary/">arranca el binario</a> para tu plataforma. O usa Gitea con <a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> o <a target="_blank" rel="noopener noreferrer" href="https://github.com/alvaroaleman/ansible-gitea/blob/master/Vagrantfile">Vagrant</a>, o utilice el <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/install-from-package/">paquete</a>.
-platform=Multiplatforma
+platform=Multiplataforma
 platform_desc=Gitea funciona en cualquier platforma <a target="_blank" rel="noopener noreferrer" href="http://golang.org/">Go</a> puede compilarlo en: Windows, macOS, Linux, ARM, etc. ¡Elige tu favorita!
 lightweight=Ligero
 lightweight_desc=Gitea tiene pocos requisitos y puede funcionar en una Raspberry Pi barata. ¡Ahorra energía!

options/locale/locale_ja-JP.ini

@@ -76,7 +76,7 @@ loading=読み込み中…
 [startpage]
 app_desc=痛みのない、自己ホスト型のGitサービス
 install=簡単インストール
-install_desc=プラットフォームにあわせて<a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/install-from-binary/">バイナリを実行する</a>だけ。 <a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea/tree/master/docker">Dockerや</a><a target="_blank" rel="noopener noreferrer" href="https://github.com/alvaroaleman/ansible-gitea/blob/master/Vagrantfile">Vagrantで</a>Giteaを<ruby>出荷<rp>(</rp><rt>シップ</rt><rp>)</rp></ruby>することも、<a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/install-from-package/">パッケージで</a>入手することもできます。
+install_desc=プラットフォームにあわせて<a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/install-from-binary/">バイナリを実行する</a>だけ。 <a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a>や<a target="_blank" rel="noopener noreferrer" href="https://github.com/alvaroaleman/ansible-gitea/blob/master/Vagrantfile">Vagrant</a>でGiteaを<ruby>出荷<rp>(</rp><rt>シップ</rt><rp>)</rp></ruby>することも、<a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/install-from-package/">パッケージ</a>で入手することもできます。
 platform=クロスプラットフォーム
 platform_desc=Giteaは<a target="_blank" rel="noopener noreferrer" href="http://golang.org/">Go</a>でコンパイルできる環境ならどこでも動きます: Windows、macOS、Linux、ARM等々、好きなものを選ぼう!
 lightweight=軽量

options/locale/locale_tr-TR.ini

@@ -882,17 +882,17 @@ issues.due_date_form_edit=Düzenle
 issues.due_date_form_remove=Kaldır
 issues.due_date_not_writer=Bir konunun bitiş tarihini değiştirmek için depoda yazma hakkınız olmalıdır.
 issues.due_date_not_set=Bitiş tarihi atanmadı.
-issues.due_date_added=eklenen bitiş tarihi %s %s
-issues.due_date_remove=kaldırılan bitiş tarihi %s %s
+issues.due_date_added=%[2]s %[1]s bitiş tarihini ekledi
+issues.due_date_remove=%[2]s %[1]s bitiş tarihini kaldırdı
 issues.dependency.title=Bağımlılıklar
 issues.dependency.issue_no_dependencies=Bu konu henüz bir bağımlılık içermiyor.
 issues.dependency.pr_no_dependencies=Bu çekme isteği henüz bir bağımlılık içermiyor.
 issues.dependency.add=Bağımlılık ekle…
 issues.dependency.cancel=İptal
 issues.dependency.remove=Kaldır
 issues.dependency.remove_info=Bu bağımlılığı kaldır
-issues.dependency.added_dependency=`<a href="%[1]s">%[2]s</a> yeni bir bağımlık ekledi %[3]s`
-issues.dependency.removed_dependency=`<a href="%[1]s">%[2]s</a> bir bağımlılığı kaldırdı %[3]s`
+issues.dependency.added_dependency=`<a href="%[1]s">%[2]s</a> %[3]s yeni bir bağımlık ekledi`
+issues.dependency.removed_dependency=`<a href="%[1]s">%[2]s</a> %[3]s bir bağımlılığı kaldırdı`
 issues.dependency.issue_closing_blockedby=Bu değişiklik isteğinin kapatılması aşağıdaki konular nedeniyle engelleniyor
 issues.dependency.pr_closing_blockedby=Bu konunun kapatılması aşağıdaki konular tarafından engelleniyor
 issues.dependency.issue_close_blocks=Bu konu aşağıdaki konuların kapatılmasını engelliyor
@@ -1662,7 +1662,7 @@ config.offline_mode=Yerel Kip
 config.disable_router_log=Yönlendirici Log'larını Devre Dışı Bırak
 config.run_user=Şu Kullanıcı Olarak Çalıştır
 config.run_mode=Çalıştırma Modu
-config.git_version=Git Sürüm
+config.git_version=Git Sürümü
 config.repo_root_path=Depo Kök Yolu
 config.lfs_root_path=LFS Kök Dizini
 config.static_file_root_path=Sabit Dosya Kök Yolu