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

fix: add migration to ensure consistency between resource_name in fiat_resource and fiat_permission tables (backport #964) #978

Merged
merged 4 commits into from
Oct 13, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2022

This is an automatic backport of pull request #964 done by Mergify.
Cherry-pick of 611cd94 has failed:

On branch mergify/bp/release-1.28.x/pr-964
Your branch is up to date with 'origin/release-1.28.x'.

You are currently cherry-picking commit 611cd94.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   fiat-sql/src/main/resources/db/changelog/20220727-resource-name-to-lower-case.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fiat-sql/src/main/resources/db/changelog-master.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…t_resource and fiat_permission tables (#964)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 611cd94)

# Conflicts:
#	fiat-sql/src/main/resources/db/changelog-master.yml
@link108 link108 merged commit 907d0d7 into release-1.28.x Oct 13, 2022
@link108 link108 deleted the mergify/bp/release-1.28.x/pr-964 branch October 13, 2022 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants