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

Remove unnecessary inline style for tab-size #31224

Merged
merged 3 commits into from
Jun 3, 2024
Merged

Remove unnecessary inline style for tab-size #31224

merged 3 commits into from
Jun 3, 2024

Conversation

silverwind
Copy link
Member

Move the rule to the parent node. tab-size is inherited so will work just as before.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 2, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 2, 2024
@silverwind silverwind added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Jun 2, 2024
@github-actions github-actions bot added modifies/go Pull requests that update Go code and removed type/refactoring Existing code has been cleaned up. There should be no new functionality. labels Jun 2, 2024
@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 Jun 3, 2024
@silverwind
Copy link
Member Author

silverwind commented Jun 3, 2024 •
edited
Loading

Failure looks unrelated.

    api_branch_test.go:257: 
        	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/api_branch_test.go:257
        	Error:      	"[0xc03bbdf290 0xc03bbdf320 0xc03bbdf3b0]" should have 5 item(s), but has 3
        	Test:       	TestAPICreateBranchWithSyncBranches

Filed #31226

@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 Jun 3, 2024
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 3, 2024
@silverwind silverwind enabled auto-merge (squash) June 3, 2024 16:53
@silverwind silverwind merged commit 0f0db6a into go-gitea:main Jun 3, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Jun 3, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 3, 2024
@silverwind silverwind deleted the rmil branch June 3, 2024 18:14
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 4, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
e7da210 
* giteaofficial/main:
  Add option for mailer to override mail headers (go-gitea#27860)
  Move custom `tw-` helpers to tailwind plugin (go-gitea#31184)
  Remove unnecessary inline style for tab-size (go-gitea#31224)
  Document possible action types for the user activity feed API (go-gitea#31196)
  Remove sqlite-viewer and using database client (go-gitea#31223)
  Update golangci-lint to v1.59.0 (go-gitea#31221)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@delvh delvh delvh 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. modifies/go Pull requests that update Go code size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.
4 participants
@silverwind @lunny @delvh @GiteaBot