Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable H014 and H023 djlint rules #25786

Merged
merged 2 commits into from
Jul 9, 2023
Merged

Enable H014 and H023 djlint rules #25786

merged 2 commits into from
Jul 9, 2023

Conversation

silverwind
Copy link
Member

Enable these rules:

  • H014 | More than 2 blank lines.
  • H023 | Do not use entity references.

There are more potential rules to enable but they are blocked by bugs in the linter:

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 9, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 9, 2023
@silverwind silverwind added topic/code-linting skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 9, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 9, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 9, 2023
@6543 6543 enabled auto-merge (squash) July 9, 2023 19:58
@6543 6543 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 9, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 9, 2023
@6543 6543 merged commit 61e0d1a into go-gitea:main Jul 9, 2023
24 checks passed
delvh
delvh reviewed Jul 9, 2023
View reviewed changes
templates/repo/editor/edit.tmpl
@@ -52,8 +52,6 @@
{{template "repo/editor/commit_form" .}}
</form>
</div>


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why both?

templates/repo/settings/options.tmpl
<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
{{.CsrfTokenHtml}}
<div class="inline field">
<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
</div>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in this file look a bit arbitrary?
What's the reason for them?

templates/user/auth/change_passwd_inner.tmpl
@@ -11,13 +11,10 @@
<label for="password">{{.locale.Tr "password"}}</label>
<input id="password" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
</div>


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, both?

@GiteaBot GiteaBot added this to the 1.21.0 milestone Jul 9, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 9, 2023
@delvh
Copy link
Member

delvh commented Jul 9, 2023

Apparently I was 10 seconds too late 😁

@silverwind
Copy link
Member Author

Do we really need to discuss whitespace changes? :D

@silverwind silverwind deleted the lintt branch July 9, 2023 22:13
@delvh
Copy link
Member

delvh commented Jul 9, 2023

Well, what confused me is simply that the rule says two subsequent empty lines are forbidden, and you deleted more than necessary?

@silverwind
Copy link
Member Author

Yes, I deleted a few more a I saw fit. Generally I think we should have zero empty lines, could likely make a sed replacement for it if appreciated.

@delvh
Copy link
Member

delvh commented Jul 9, 2023

Actually, blank lines do have a purpose: They separate groups visually for humans.
That's why I'm somewhat against removing more than necessary.

zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 10, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
28f689d 
* giteaofficial/main: (31 commits)
  Fix WORK_DIR for docker (root) image (go-gitea#25738)
  Avoid amending the Rebase and Fast-forward merge if there is no message template (go-gitea#25779)
  Show edit title button on commits tab of PR, too (go-gitea#25791)
  Make "install page" respect environment config (go-gitea#25648)
  Enable H014 and H023 djlint rules (go-gitea#25786)
  Restructure issue list template, styles (go-gitea#25750)
  Fix notification list bugs (go-gitea#25781)
  Revert package access change from go-gitea#23879 (go-gitea#25707)
  Make route middleware/handler mockable (go-gitea#25766)
  Update tool dependencies, lock govulncheck and actionlint (go-gitea#25655)
  Test if container blob is accessible before mounting (go-gitea#22759)
  Always pass 6-digit hex color to monaco (go-gitea#25780)
  Fix the wrong default branch name displayed by checkout (go-gitea#25777)
  Tweak repo topics bar (go-gitea#25769)
  docs: rootless docker ssh's default port is 2222 (go-gitea#25771)
  Repository Archived text title center align (go-gitea#25767)
  Update JS dependencies, misc tweaks (go-gitea#25768)
  Clarify "text-align" CSS helpers, fix clone button padding (go-gitea#25763)
  Switch to `vite-string-plugin` (go-gitea#25762)
  Newly pushed branches hints on repository home page (go-gitea#25715)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh left review comments

@techknowlogick techknowlogick techknowlogick approved these changes

@6543 6543 6543 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/code-linting
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@silverwind @delvh @techknowlogick @6543 @GiteaBot