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.

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

Use correct branch for .editorconfig error #21152

Merged
merged 2 commits into from
Sep 14, 2022
Merged

Conversation

JakobDev
Copy link
Contributor

In #21088 I accidentally forgot to support multiple branches. It always checks the default branch, no matter on which branch you are working on. With this fix, it always shows the error from the current branch. Sorry for that.

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Sep 14, 2022
@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 Sep 14, 2022
@lunny lunny added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Sep 14, 2022
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

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

missed that too

@6543 6543 merged commit cad8f1b into go-gitea:main Sep 14, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 15, 2022
* upstream/main:
  Display image digest for container packages (go-gitea#21170)
  Use correct branch for .editorconfig error (go-gitea#21152)
  Passing command line arguments correctly by string slice (go-gitea#21168)
  Sort branches and tags by date descending (go-gitea#21136)
  Skip dirty check for team forms (go-gitea#21154)
  Add KaTeX rendering to Markdown. (go-gitea#20571)
@JakobDev JakobDev deleted the editorfix branch September 16, 2022 14:22
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants