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

chore: update comments for dhis.conf keys #19042

Merged
merged 5 commits into from
Feb 27, 2025
Merged

Conversation

dayures
Copy link
Contributor

@dayures dayures commented Nov 4, 2024

No description provided.

@larshelge
Copy link
Member

Looks good. There is a conflict @dayures .

@dayures
Copy link
Contributor Author

dayures commented Jan 30, 2025

thanks @larshelge Can I help somehow to resolve the conflict?

@stian-sandvold stian-sandvold enabled auto-merge (squash) February 26, 2025 11:58
@stian-sandvold
Copy link
Contributor

Hey @dayures , I resolved some conflicts and the PR is mostly ready to merge. The main thing remaining is formatting. Since this is a forked branch, the easiest solution is if you can run the formatting tool on your branch. You can do this by running "mvn spotless:apply", which will automatically format your changes.

There is also an issue with SonarQube, where external forks are rejected (Since they are not part of the organisation). Due to the nature of this PR, I can force merge the PR, as long as all the other checks are passing (Like formatting).

Let me know if you have any questions.

auto-merge was automatically disabled February 26, 2025 17:04

Head branch was pushed to by a user without write access

@dayures
Copy link
Contributor Author

dayures commented Feb 26, 2025

Hi @stian-sandvold I did the changes (run the mvn spotless:apply) in my forked branch, and it looks like it passess the format tests. I hope it helps.

@stian-sandvold stian-sandvold merged commit f01cd55 into dhis2:master Feb 27, 2025
14 of 15 checks passed
@stian-sandvold
Copy link
Contributor

Perfect, thank you @dayures , I merged the PR :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants