Summit

Merge lp://staging/~mhall119/summit/preserve-required into lp://staging/summit

  1. preserve-required
  2. Merge into trunk
Proposed by Chris Johnston
Status: Superseded
Proposed branch: lp://staging/~mhall119/summit/preserve-required
Merge into: lp://staging/summit
Diff against target: 50 lines (+7/-7)
3 files modified
summit/schedule/models/meetingmodel.py (+5/-4)
summit/schedule/tests/tests.py (+1/-2)
summit/schedule/views.py (+1/-1)
To merge this branch: bzr merge lp://staging/~mhall119/summit/preserve-required
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+150705@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2013-02-27.

Commit message

Keeps required participants required.

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote :

Conflicts need to be fixed please.

review: Needs Fixing
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote :

Attempt to merge into lp:summit failed due to conflicts:

text conflict in summit/schedule/tests/tests.py
text conflict in summit/schedule/views.py

lp://staging/~mhall119/summit/preserve-required updated
490. By Michael Hall

[r=daker] Adds a javascript refresh to the youtube placeholder image to continue checking for a video url

491. By Chris Johnston

[r=mhall119] Separate tests into different files

492. By Michael Hall

Once again, merge from trunk and fix conflicts

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches