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

Enables group api to search by custom attribute and to return custom_attributes #1099

Merged
merged 2 commits into from
Apr 13, 2024
Merged

Conversation

Jenson3210
Copy link
Contributor

Fixes #1098 + Added integration tests

Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you please update the group.json in the test suite, so that your addition to the model is tested/used.

@Test
public void testGroup() throws Exception {
Group group = unmarshalResource(Group.class, "group.json");
assertTrue(compareJson(group, "group.json"));
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added a custom attributes array

@Jenson3210
Copy link
Contributor Author

any update here?

@jmini
Copy link
Collaborator

jmini commented Apr 12, 2024

Sorry I had busy weeks at work and had no time to check updates in this repo.

Jente Sondervorst added 2 commits April 12, 2024 18:28
@jmini
Copy link
Collaborator

jmini commented Apr 12, 2024

I have rebased the source branch of this PR (6.x in the Jenson3210 fork) on top of main of this repo:

git rebase --onto origin/main origin/6.x
git push Jenson3210 HEAD:6.x --force

Be aware that your local branch 6.x has diverged with the one on the GitHub.
If you need to do one more changes on this branch:
I recommend to use git fetch and git reset --hard origin/6.x (assuming your local origin is pointing to the Jenson3210 fork on GitHub) before doing any local modifications instead of git pull.

@jmini jmini changed the base branch from 6.x to main April 12, 2024 16:34
@jmini jmini merged commit fcecb0b into gitlab4j:main Apr 13, 2024
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.

Groups api does not support custom attributes completely
2 participants