View source for Gaia/UX Branch/Maintenance

== Pull Requests ==

Merged with master:

* ux-2012-11-29-cherry-picked
* ux-2012-11-22-cherry-picked

== Process ==

* Update UX Branch Daily
* Review pull requests 2-3 times a week
** Make sure commit has bug number. Check bug in Bugzilla.
** Add Status Whiteboard "uxbranch" (if it doesn't have the tag already)
** Review patch, understand risk-level of patch
** Apply patch locally and test on-device
** If all is OK, merge pull request.
** Only one commit per fix! Make sure commit has bug # and details. If necessary, apply as patch and fix commit message.
** Add Status Whiteboard "landed in uxbranch"
* Create a pull request for qa-verified bugs every week.
** Cherry pick commits verified by QA and merged into UX, but not yet in master. Prefer cherry-picking the original commit instead of the merge commit.
** Issue pull request.
** Include links to bugs in pull request message.

Good news: cherry pick should fail noisily if it can't merge properly.
Note: you can get the original commit for a merge by clicking on the right-hand parent commit.

== Patching ==

To keep commit history clean, sometimes it makes sense to use git patch instead of merging a pull request.

When patching, use this format:

    Bug 123456 - Apply patch from f4fdd305b24ac62248f28ee7cebde966f4f3d804
    
    From f4fdd305b24ac62248f28ee7cebde966f4f3d804 Mon Sep 17 00:00:00 2001
    From: Joe Schmo <jschmo@hotmail.com>
    Date: Thu, 29 Nov 2012 12:45:52 -0500
    Subject: [PATCH] Bug 813140 - Contacts iconography fix for contact
    details screen
    
    Bug 813140 - Contacts iconography fix for contact details screen
    
    This change fixes Bug 813140: [Gaia::Contacts] Contact Details page not
    using the latest iconography from Visual Design.

* [https://bugzilla.mozilla.org/buglist.cgi?list_id=5022636;status_whiteboard_type=allwordssubstr;query_format=advanced;status_whiteboard=uxbranch;product=Boot2Gecko Status Whiteboard: uxbranch] all bugs targeted for, or merged into UX Branch
* [https://bugzilla.mozilla.org/buglist.cgi?status_whiteboard_type=allwordssubstr;query_format=advanced;list_id=5022700;status_whiteboard=uxbranch%2Cqa-verified;product=Boot2Gecko Status Whiteboard: uxbranch, qa-verified] all UX branch bugs that have been verified by QA
* [https://bugzilla.mozilla.org/buglist.cgi?list_id=5022683;status_whiteboard_type=allwordssubstr;query_format=advanced;status_whiteboard=landed%20in%20uxbranch;product=Boot2Gecko Status Whiteboard: landed in uxbranch] all bugs landed in UX Branch
* [https://bugzilla.mozilla.org/buglist.cgi?type0-1-0=notsubstring;list_id=5022815;field0-1-0=status_whiteboard;field0-0-0=status_whiteboard;query_format=advanced;value0-1-0=qa-verified;type0-0-0=substring;value0-0-0=uxbranch;product=Boot2Gecko Status Whiteboard: uxbranch AND NOT qa-verified] everything yet to be verified by QA
* [https://bugzilla.mozilla.org/buglist.cgi?type0-1-0=substring&list_id=5024470&field0-1-0=status_whiteboard&field0-0-0=status_whiteboard&query_format=advanced&value0-1-0=qa-verified&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=READY&bug_status=ASSIGNED&bug_status=REOPENED&type0-0-0=substring&value0-0-0=landed%20in%20uxbranch&product=Boot2Gecko Status Whiteboard: landed in uxbranch, qa-verified AND open] candidates for merge with master