Closed Bug 702988 Opened 14 years ago Closed 14 years ago

kuma-mdn: merge conflicts

Categories

(developer.mozilla.org Graveyard :: Wiki pages, defect)

Product:
developer.mozilla.org Graveyard
Component:
Wiki pages
Platform:
x86
macOS
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: groovecoder, Assigned: lorchard)

References

Details

(Whiteboard: u=developer c=wiki p=3)

* Trouble in apps/devmo; try merge again after the auth switch with bug 674635 is completed. * There's trouble in apps/landing to sort out. * Hand-resolve conflicts in configs/htaccess * Investigate some files that unexpectedly merged without issue. * (eg. settings.py, urls.py, templates/base.html)
Depends on: 674635
Missing a few things from bug 699104: * Rework scripts/update_site.py so it only knows about the unified branch * Spend some time untangling the mess made of Vagrant + Puppet - probably my gig, alas.
Whiteboard: u=developer c=wiki p= → u=developer c=wiki p=3
Never mind my last comment - those points are covered by bug 702989 and bug 702990, respectively
Assignee: nobody → lorchard
Blocks: 705849
Target Milestone: 1.7 → 1.8
This work has been merged to the mdn branch
Status: NEW → RESOLVED
Closed: 14 years ago
Resolution: --- → FIXED
Commit pushed to https://github.com/mozilla/kuma https://github.com/mozilla/kuma/commit/848c6d91cc1d73881302af67cca74ad4e68ce8a0 bug 702988 - Schematic migrations to wipe the old mdn branch wiki tables, so South can rebuild them
Version: Kuma → unspecified
Component: Website → Landing pages
Product: developer.mozilla.org → developer.mozilla.org Graveyard
You need to log in before you can comment on or make changes to this bug.