-
Notifications
You must be signed in to change notification settings - Fork 35
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
6.2.x to 7.0.x merge #502
Closed
Closed
6.2.x to 7.0.x merge #502
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…late does not exist.
--refresh-dependencies
Allow optional attribute for g.render that will ignore if tag if template does not exist.
Merge 6.2.x
6.2.x render exception
* revert github resolve merge conflict bug that resulted in 7.0.x merge into 6.2.x branch * use grails-core:6.2.1-SNAPSHOT
This reverts commit fc4e2a3.
Merges 6.2.x into 7.0.x - we should have zero files changed. |
jamesfredley
approved these changes
Oct 3, 2024
no longer needed |
@codeconsole you'll need to force push 6.2.x otherwise when we merge a branch off of 6.2.x in the future, the revert will be applied to the 7.0.x branch. |
@jdaugherty it was already done when I closed the ticket 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.