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

Clean up drone settings a bit more from #1021 #1024

Merged
merged 2 commits into from Feb 23, 2015

Conversation

gasman
Copy link
Collaborator

@gasman gasman commented Feb 23, 2015

No idea if I'm doing the right thing here, but let's see what happens when I submit...

f2f57fb doesn't do the job for me, because: 1) I need to be able to pass in DATABASE_HOST / DATABASE_PORT variables for #1020, and 2) it seems a bit ugly for tests/settings.py to be checking for Drone specifically - the Drone config should be passing in the settings it needs instead. Here's my attempt at an improved version.

@@ -127,8 +126,8 @@
}

# Check if we're running in Drone
Copy link
Contributor

Choose a reason for hiding this comment

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

You can remove this comment now

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Doh... removed now.

kaedroho added a commit that referenced this pull request Feb 23, 2015
@kaedroho kaedroho merged commit 8dc8e9c into wagtail:master Feb 23, 2015
@gasman gasman deleted the fix/drone-settings-cleanup branch February 23, 2015 15:33
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.

None yet

2 participants