Merge lp://staging/~codersquid/capomastro/local-forreal into lp://staging/capomastro
Proposed by
Sheila Miguez
| Status: | Merged |
|---|---|
| Approved by: | Daniel Manrique |
| Approved revision: | 181 |
| Merged at revision: | 182 |
| Proposed branch: | lp://staging/~codersquid/capomastro/local-forreal |
| Merge into: | lp://staging/capomastro |
| Diff against target: |
37 lines (+9/-0) 3 files modified
.gitignore (+1/-0) capomastro/local_settings.py (+3/-0) capomastro/settings.py (+5/-0) |
| To merge this branch: | bzr merge lp://staging/~codersquid/capomastro/local-forreal |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Caio Begotti (community) | Approve | ||
| Daniel Manrique (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This is a small change that allows users to define local settings that can be imported in to settings. I added a comment to local_settings.py to explain that it is called that for historical
reasons and direct a user to make local.py for local settings.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I'm OK with this, hopefully users will read the comment before mucking around with local_settings. I prefer to wait for an ack from Caio in case this could impact his stack but I believe it will be OK.