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

[4.6.x] fix: change field size for client #5265

Merged
merged 1 commit into from
Dec 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

This is an automatic copy of pull request #5259 done by Mergify.


This is an automatic copy of pull request #5250 done by Mergify.


Fixes AM-4549
Updating client column to 255 characters


Cherry-pick of d0b4f90 has failed:

On branch mergify/bp/4.5.x/pr-5250
Your branch is up to date with 'origin/4.5.x'.

You are currently cherry-picking commit d0b4f902f3.
  (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:   gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/changelogs/v4_2_27/4.2.27-change-client-column-size.yml
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/AccessTokenRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/AuthorizationCodeRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/CibaAuthRequestRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/PushedAuthorizationRequestRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/RefreshTokenRepositoryTest.java
	new file:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/ScopeApprovalRepositoryTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/master.yml
	both modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/management/api/DeviceRepositoryTest.java

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


@mergify mergify bot requested a review from a team as a code owner December 16, 2024 13:12
@podlesrafal podlesrafal changed the title [4.6.x] [4.5.x] fix: change field size for client [4.6.x] fix: change field size for client Dec 16, 2024
@podlesrafal podlesrafal force-pushed the mergify/bp/4.6.x/pr-5259 branch from f9efb46 to 072b2a0 Compare December 17, 2024 12:53
@podlesrafal podlesrafal force-pushed the mergify/bp/4.6.x/pr-5259 branch from 072b2a0 to 8e272b4 Compare December 17, 2024 13:40
(cherry picked from commit d0b4f90)

# Conflicts:
#	gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/master.yml
#	gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/management/api/DeviceRepositoryTest.java
(cherry picked from commit df1ada0)
@podlesrafal podlesrafal force-pushed the mergify/bp/4.6.x/pr-5259 branch from 8e272b4 to 56045e1 Compare December 18, 2024 08:57
@podlesrafal podlesrafal merged commit 34fbb00 into 4.6.x Dec 19, 2024
25 checks passed
@podlesrafal podlesrafal deleted the mergify/bp/4.6.x/pr-5259 branch December 19, 2024 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants