Skip to content

Saml2AuthenticationRequestContext should be extendible #8356 #8364

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

Closed
wants to merge 1 commit into from

Conversation

shazin
Copy link
Contributor

@shazin shazin commented Apr 9, 2020

Fixes issue #8356

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Apr 9, 2020
@jzheaux jzheaux self-assigned this Apr 10, 2020
@jzheaux jzheaux added in: saml2 An issue in SAML2 modules status: duplicate A duplicate of another issue type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged labels Apr 10, 2020
@jzheaux jzheaux added this to the 5.4.0.M1 milestone Apr 10, 2020
@jzheaux
Copy link
Contributor

jzheaux commented Apr 10, 2020

Thanks, @shazin! Would you please squash your commits and format it to look something like:

Open Saml2AuthenticationRequestContext

Fixes gh-8356

For extra context, please see the contribution guidelines for squashing and formatting commits.

@shazin
Copy link
Contributor Author

shazin commented Apr 11, 2020

I tried squashing but it doesn't seem to show any commits to squash.

@jzheaux
Copy link
Contributor

jzheaux commented Apr 13, 2020

No problem, @shazin, let's try this.

Can you rebase your branch with master? For example, if you've defined the spring-projects/spring-security upstream as spring-projects and your own fork as origin, you can do this:

git checkout master
git reset --hard spring-projects/master
git push origin +master
git checkout gh-8356
git rebase master

At that point, a git log master.. should only return the commits on the gh-8356 branch that you've committed, and it won't have any merge commits.

At that point, doing something like git rebase -i gh-8356~x (where x is the number of commits to view) should show you a set of commits that makes sense to squash.

Once the commit list on the gh-8356 branch looks like you want it to, then you can do git push origin +gh-8356 and GitHub will update the PR here.

@shazin
Copy link
Contributor Author

shazin commented Apr 14, 2020

I Followed the instruction and now only one commit is visible. Thanks

@jzheaux
Copy link
Contributor

jzheaux commented Apr 14, 2020

Awesome, @shazin! This is now merged into master via 4e5a3a7

@jzheaux jzheaux closed this Apr 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in: saml2 An issue in SAML2 modules status: duplicate A duplicate of another issue type: enhancement A general enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants