Merge branch 'master' into fix-13271-move-original-author-into-reaction-constraint

Author: zeripath

.stylelintrc

@@ -11,5 +11,5 @@ rules:
   no-descending-specificity: null
   number-leading-zero: never
   rule-empty-line-before: null
-  selector-pseudo-element-colon-notation: null
+  selector-pseudo-element-colon-notation: double
   shorthand-property-no-redundant-values: true

models/migrations/v156.go

@@ -55,6 +55,7 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
 	var (
 		repo    *Repository
 		gitRepo *git.Repository
+		user    *User
 	)
 	defer func() {
 		if gitRepo != nil {
@@ -69,7 +70,7 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
 		}
 
 		if err := sess.Limit(batchSize, start).
-			Where("publisher_id = 0").
+			Where("publisher_id = 0 OR publisher_id is null").
 			Asc("repo_id", "id").Where("is_tag=?", true).
 			Find(&releases); err != nil {
 			return err
@@ -117,17 +118,21 @@ func fixPublisherIDforTagReleases(x *xorm.Engine) error {
 				return fmt.Errorf("GetTagCommit: %v", err)
 			}
 
-			u := new(User)
-			exists, err := sess.Where("email=?", commit.Author.Email).Get(u)
-			if err != nil {
-				return err
+			if user == nil || !strings.EqualFold(user.Email, commit.Author.Email) {
+				user = new(User)
+				_, err = sess.Where("email=?", commit.Author.Email).Get(user)
+				if err != nil {
+					return err
+				}
+
+				user.Email = commit.Author.Email
 			}
 
-			if !exists {
+			if user.ID <= 0 {
 				continue
 			}
 
-			release.PublisherID = u.ID
+			release.PublisherID = user.ID
 			if _, err := sess.ID(release.ID).Cols("publisher_id").Update(release); err != nil {
 				return err
 			}

options/locale/locale_tr-TR.ini

@@ -1038,7 +1038,7 @@ issues.action_assignee=Atanan
 issues.action_assignee_no_select=Atanan yok
 issues.opened_by=<a href="%[2]s">%[3]s</a> tarafından %[1]s açıldı
 pulls.merged_by=%[1]s <a href="%[2]s">%[3]s</a> tarafından birleştirildi
-pulls.merged_by_fake=%[1]s %[2]s tarafından birleştirildi
+pulls.merged_by_fake=%[2]s tarafından açılan istek %[1]s birleştirildi
 issues.closed_by=%[1]s <a href="%[2]s">%[3]s</a> tarafından kapatıldı
 issues.opened_by_fake=%[1]s %[2]s tarafından açıldı
 issues.closed_by_fake=%[1]s %[2]s tarafından kapatıldı

package-lock.json

@@ -14,10 +14,12 @@
     "add-asset-webpack-plugin": "1.0.0",
     "babel-loader": "8.1.0",
     "clipboard": "2.0.6",
+    "codemirror": "5.58.2",
     "core-js": "3.7.0",
     "css-loader": "5.0.1",
     "css-minimizer-webpack-plugin": "1.1.5",
     "dropzone": "5.7.2",
+    "easymde": "2.12.1",
     "escape-goat": "3.0.0",
     "fast-glob": "3.2.4",
     "file-loader": "6.2.0",

package.json

@@ -90,7 +90,7 @@
 					</div>
 				</div>
 				<div class="inline field">
-					<div class="ui checkbox" data-tooltip="{{.i18n.Tr "admin.users.allow_git_hook_tooltip"}}">
+					<div class="ui checkbox poping up" data-content="{{.i18n.Tr "admin.users.allow_git_hook_tooltip"}}" data-variation="very wide">
 						<label><strong>{{.i18n.Tr "admin.users.allow_git_hook"}}</strong></label>
 						<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>
 					</div>

public/vendor/plugins/simplemde/LICENSE

@@ -12,7 +12,7 @@
 
 	{{template "base/footer_content" .}}
 {{if .RequireSimpleMDE}}
-	<script src="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.js"></script>
+	<script src="{{StaticUrlPrefix}}/js/easymde.js?v={{MD5 AppVer}}"></script>
 	<script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
 	<script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/mode/meta.js"></script>
 	<script>

public/vendor/plugins/simplemde/simplemde.min.css

@@ -64,7 +64,7 @@
 	<link rel="mask-icon" href="{{StaticUrlPrefix}}/img/gitea-safari.svg" color="#609926">
 	<link rel="fluid-icon" href="{{StaticUrlPrefix}}/img/gitea-lg.png" title="{{AppName}}">
 {{if .RequireSimpleMDE}}
-	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.css">
+	<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/easymde.css?v={{MD5 AppVer}}">
 {{end}}
 	<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
 	<noscript>

public/vendor/plugins/simplemde/simplemde.min.js

@@ -17,7 +17,7 @@
 					<input type="checkbox" name="all" id="all" value="true" {{.All}}>
 					<label for="all">{{.i18n.Tr "repo.commits.search_all"}} &nbsp;&nbsp;</label>
 				</div>
-				<button class="ui primary tiny button mr-0" data-panel="#add-deploy-key-panel" data-tooltip={{.i18n.Tr "repo.commits.search.tooltip"}}>{{.i18n.Tr "repo.commits.find"}}</button>
+				<button class="ui primary tiny button mr-0 poping up" data-panel="#add-deploy-key-panel" data-content={{.i18n.Tr "repo.commits.search.tooltip"}}>{{.i18n.Tr "repo.commits.find"}}</button>
 			</form>
 		{{else if .IsDiffCompare}}
 			<a href="{{$.CommitRepoLink}}/commit/{{.BeforeCommitID}}" class="ui green sha label">{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}}</a>

templates/admin/user/edit.tmpl

@@ -73,7 +73,7 @@
 								<input class="hidden" name="git_content" type="checkbox" tabindex="0" {{if .git_content}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.template.git_content"}}</label>
 							</div>
-							<div class="ui checkbox" {{if not .SignedUser.CanEditGitHook}}data-tooltip="{{.i18n.Tr "repo.template.git_hooks_tooltip"}}"{{end}}>
+							<div class="ui checkbox{{if not .SignedUser.CanEditGitHook}} poping up{{end}}"{{if not .SignedUser.CanEditGitHook}} data-content="{{.i18n.Tr "repo.template.git_hooks_tooltip"}}"{{end}}>
 								<input class="hidden" name="git_hooks" type="checkbox" tabindex="0" {{if .git_hooks}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.template.git_hooks"}}</label>
 							</div>