Add crowd SSO functionality #57
Merged
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
| repositories: | ||
| stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib" | ||
| deploy: "https://github.com/mkrakowitzer/puppet-deploy.git" | ||
| staging: "https://github.com/nanliu/puppet-staging.git" |
There was a problem hiding this comment.
is there a specific reason for this change?
There was a problem hiding this comment.
this was done by mistake, I'll checkout that file from master.
|
Can you squash? |
|
and rebase… relatedly, this project needs |
|
Just squashed my changes into one commit. Should be fine now. |
|
@patricktoelle I'm seeing merge conflicts. |
|
Hi, just resolved the merge conflict. |
|
Oh, rubocop Tests are failing. I'll have a look on that later. |
|
Tests are working now, please merge :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add crowd's single sign on feature to confluence. When using delegated authentication via Atlassian Crowd, you are able to activate this feature according to Atlassian's documentation at https://confluence.atlassian.com/display/CROWD/Integrating+Crowd+with+Atlassian+Confluence#IntegratingCrowdwithAtlassianConfluence-2.2EnableSSOintegrationwithCrowd