go-gitea · techknowlogick · Apr 11, 2021 · Apr 5, 2021 · Apr 10, 2021 · Apr 10, 2021
diff --git a/.editorconfig b/.editorconfig
@@ -12,6 +12,12 @@ insert_final_newline = true
 [*.{go,tmpl,html}]
 indent_style = tab
 
+[templates/custom/*.tmpl]
+insert_final_newline = false
+
+[templates/swagger/v1_json.tmpl]
+indent_style = space
+
 [Makefile]
 indent_style = tab
 

diff --git a/Makefile b/Makefile
@@ -325,6 +325,7 @@ lint: lint-frontend lint-backend
 lint-frontend: node_modules
 	npx eslint --color --max-warnings=0 web_src/js build templates *.config.js
 	npx stylelint --color --max-warnings=0 web_src/less
+	npx editorconfig-checker templates
 
 .PHONY: lint-backend
 lint-backend: golangci-lint revive vet

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
   },
   "devDependencies": {
     "eslint": "7.23.0",
+    "editorconfig-checker": "4.0.2",
     "eslint-plugin-html": "6.1.2",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-unicorn": "29.0.0",

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
diff --git a/templates/admin/auth/source/ldap.tmpl b/templates/admin/auth/source/ldap.tmpl
diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl
diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
diff --git a/templates/base/alert_details.tmpl b/templates/base/alert_details.tmpl
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl
@@ -18,7 +18,6 @@
 			</div>
 		</form>
 		<div class="ui divider"></div>
-
 		<div class="ui user list">
 			{{if .SearchResults}}
 				<h3>

diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
diff --git a/templates/mail/issue/assigned.tmpl b/templates/mail/issue/assigned.tmpl
diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl
diff --git a/templates/mail/notify/collaborator.tmpl b/templates/mail/notify/collaborator.tmpl
diff --git a/templates/mail/release.tmpl b/templates/mail/release.tmpl
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl
diff --git a/templates/org/team/navbar.tmpl b/templates/org/team/navbar.tmpl
diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl
diff --git a/templates/repo/diff/csv_diff.tmpl b/templates/repo/diff/csv_diff.tmpl
diff --git a/templates/repo/diff/image_diff.tmpl b/templates/repo/diff/image_diff.tmpl
diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl
@@ -13,16 +13,12 @@
 					<a class="muted close px-3">{{svg "octicon-x" 16}}</a>
 				</div>
 				<div class="ui field">
-					<textarea name="content" tabindex="0" rows="2"
-							  placeholder="{{$.i18n.Tr "repo.diff.review.placeholder"}}"></textarea>
+					<textarea name="content" tabindex="0" rows="2" placeholder="{{$.i18n.Tr "repo.diff.review.placeholder"}}"></textarea>
 				</div>
 				<div class="ui divider"></div>
-				<button type="submit" name="type" value="approve" {{ if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID) }} disabled {{ end }}
-						class="ui submit green tiny button btn-submit">{{$.i18n.Tr "repo.diff.review.approve"}}</button>
-				<button type="submit" name="type" value="comment"
-					        class="ui submit tiny basic button btn-submit">{{$.i18n.Tr "repo.diff.review.comment"}}</button>
-				<button type="submit" name="type" value="reject" {{ if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID) }} disabled {{ end }}
-						class="ui submit red tiny button btn-submit">{{$.i18n.Tr "repo.diff.review.reject"}}</button>
+				<button type="submit" name="type" value="approve" {{ if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID) }} disabled {{ end }} class="ui submit green tiny button btn-submit">{{$.i18n.Tr "repo.diff.review.approve"}}</button>
+				<button type="submit" name="type" value="comment" class="ui submit tiny basic button btn-submit">{{$.i18n.Tr "repo.diff.review.comment"}}</button>
+				<button type="submit" name="type" value="reject" {{ if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID) }} disabled {{ end }} class="ui submit red tiny button btn-submit">{{$.i18n.Tr "repo.diff.review.reject"}}</button>
 			</form>
 		</div>
 	</div>

diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl
diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -55,4 +55,3 @@
 		</div>
 	</div>
 </div>
-
diff --git a/templates/repo/issue/labels/label_load_template.tmpl b/templates/repo/issue/labels/label_load_template.tmpl
@@ -3,8 +3,7 @@
 		<div class="ui attached left aligned segment">
 			<!-- <h4 class="ui header">
 				{{.i18n.Tr "repo.issues.label_templates.title"}}
-				<a target="_blank" rel="noopener noreferrer"
-				   href="https://discuss.gogs.io/t/how-to-use-predefined-label-templates/599">
+				<a target="_blank" rel="noopener noreferrer" href="https://discuss.gogs.io/t/how-to-use-predefined-label-templates/599">
 					<span class="octicon octicon-question"></span>
 				</a>
 			</h4> -->

diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl
diff --git a/templates/repo/pulls/status.tmpl b/templates/repo/pulls/status.tmpl
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
diff --git a/templates/repo/settings/webhook/matrix.tmpl b/templates/repo/settings/webhook/matrix.tmpl
diff --git a/templates/repo/settings/webhook/telegram.tmpl b/templates/repo/settings/webhook/telegram.tmpl
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
diff --git a/templates/user/auth/signup_openid_navbar.tmpl b/templates/user/auth/signup_openid_navbar.tmpl
@@ -10,4 +10,3 @@
 		{{end}}
 	</div>
 </div>
-
diff --git a/templates/user/auth/twofa.tmpl b/templates/user/auth/twofa.tmpl
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
diff --git a/templates/user/settings/security_u2f.tmpl b/templates/user/settings/security_u2f.tmpl
@@ -53,4 +53,3 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
-