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.

Sign up for GitHub

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

Jump to bottom

api keys reopend #2205

Merged
merged 2 commits into from
Nov 16, 2021
Merged

api keys reopend #2205

merged 2 commits into from
Nov 16, 2021

Conversation

thoniTUB
Copy link
Collaborator

@thoniTUB thoniTUB commented Nov 15, 2021 •
edited
Loading

Continuation of #2074

@thoniTUB
ignore validation method
0d55b5d
@thoniTUB
Merge remote-tracking branch 'origin/develop' into feature/api-keys
9124d23 
# Conflicts:
#	backend/src/main/java/com/bakdata/conquery/apiv1/auth/ApiTokenDataRepresentation.java
@thoniTUB thoniTUB changed the title ignore validation method api keys reopend Nov 15, 2021
@thoniTUB thoniTUB requested a review from awildturtok November 15, 2021 16:13
awildturtok
awildturtok approved these changes Nov 16, 2021
View reviewed changes
Copy link
Collaborator

@awildturtok awildturtok left a comment

Choose a reason for hiding this comment

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

Hatten ja schon geklärt, dass außer dem JSONIgnore der Rest passt. und das JsonIgnore hast du ja hinzugefügt

@thoniTUB thoniTUB merged commit 9a70c31 into develop Nov 16, 2021
@delete-merged-branch delete-merged-branch bot deleted the feature/api-keys branch November 16, 2021 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awildturtok awildturtok awildturtok approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thoniTUB @awildturtok