Merge upstream changes for incommon-v9 #3
Merged
Back to tour
Merged
+1,369
−1,174
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was needed circa 2013 to guard against a curl-based issue in the Shibboleth SP. This can no longer affect us because we no longer use the PKIX trust model.
See ukf/ukf-meta#144.
See ukf/ukf-meta#145.
…er eduGAIN Members page
See ukf/ukf-meta#146
See ukf/ukf-meta#146
These IDs are currently defaulted by the validators, but that behaviour will go away in a future MDA release.
See ukf/ukf-meta#147.
See ukf/ukf-meta#127.
See ukf/ukf-meta#21.
See ukf/ukf-meta#149
Iterate on the generation of mdui:UIInfo for identitify providers which do not have mdui:UIInfo already. Reduces the number of warnings we get from the eduGAIN validator. See ukf/ukf-meta#150.
See ukf/ukf-meta#21.
…ort aggregates See ukf/ukf-meta#21. See ukf/ukf-meta#150.
See ukf/ukf-meta#21.
Now that this is being done everywhere, we can just do it once, and simplify the way it's done. See ukf/ukf-meta#150.
Check is flagged as warning. See ukf/ukf-meta#157
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
Relaxes the definition of a clash between identity provider display names to ignore md:OrganizationDisplayName for any IdP that has mdui:DisplayName. See ukf/ukf-meta#150.
Resolves ukf/ukf-data#20.
Resolves ukf/ukf-meta#154.
See ukf/ukf-meta#164
See ukf/ukf-meta#165
Resolves ukf/ukf-meta#169.
See ukf/ukf-meta#117.
@dshafer @nroy It's worth passing your eyes over this one in a bit more detail to see what a larger (but still non-conflicting) PR looks like. The tabs at the top allow you to look at things from the perspective of the individual commits, or alternatively by the aggregate changes to files. The latter view might be easier to skim for the current purposes, because of course you can entirely skip over any files that are UKf-specific. |
iay
commented
Feb 25, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like a clean set of changes. A trial merge behaves as expected (one CZ entity re-included).
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See inc-meta#93.