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

Fix directory fragment not setting AllowOverride #455

Merged
merged 3 commits into from
Nov 14, 2013

Conversation

Aethylred
Copy link
Contributor

need to use the provider variable not the provider key value from the directory hash for matches

@igalic
Copy link
Contributor

igalic commented Nov 13, 2013

At a rough estimate, I believe we've now changed that line back and forth about 450 times.

Perhaps it's time to stop and contemplate.

@Aethylred
Copy link
Contributor Author

currently, the master does not set AllowOverride. The directory fragment was pretty rough when I first wrote it though...

@igalic
Copy link
Contributor

igalic commented Nov 13, 2013

can you add a test to catch this?

@Aethylred
Copy link
Contributor Author

yes... I think I can figure that out... and get a start on #456

I see that #440 is reproducing this bug into new features too. I may attempt to overachieve.

@igalic
Copy link
Contributor

igalic commented Nov 13, 2013

Please do!

@Aethylred
Copy link
Contributor Author

Excellent, managed to rebase the commits together and preserve the contribution from @anyone-can-test

...next rspec tests...

@Aethylred
Copy link
Contributor Author

Done, but not fixing the tests for #456 as I'd hoped. There are tests defined to match file content, but are not being executed.

@anyone-can-test
Copy link
Contributor

Thank for for merging my changes.
Anything that I should do? I'm a very beginner, GitHub.

@Aethylred
Copy link
Contributor Author

@anyone-can-test it's up to the repository maintainers now. I pulled your changes from your github fork to maintain your attribution to them and then used git rebase to collapse them into a single commit. A bit more fuss than cut-paste, but your contribution is still yours :)

@igalic
Copy link
Contributor

igalic commented Nov 14, 2013

@Aethylred thank you for the extra bit of work. @anyone-can-test thank you for the contribution!

igalic added a commit that referenced this pull request Nov 14, 2013
Add IndexOptions parameter, fix directory fragment not setting AllowOverride
@igalic igalic merged commit 27c1b76 into puppetlabs:master Nov 14, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants