1413673 - Sync shield recipe-client v78 from Github (commit 1553a2e)

Status: RESOLVED INVALID

(Firefox :: Normandy Client, enhancement)

Description

[Michael Cooper [:mythmon]]

Changes between v76 and v78

808de48 - PR #1100 - Revert study preferences to empty when appropriate.
b2d0f66 - Bug 1402528 - recipe-client-addon: Watch prefs and enable/disable as needed.
4a7bf80 - Cachebust Taskcluster docker image.
0dc3796 - Fixes #1100 Reset pref studies to the correct value when stopping.
1c5fac1 - No need to specify Cc/Ci/Cu as global in head_xpc.js
1235959 - #354 - Use the correct preference for telemetry.

Comment 1

[Michael Cooper [:mythmon]]

Attachment: Bug 1413673 - Sync shield recipe-client v78 from Github (commit 1553a2e)

Review commit: https://reviewboard.mozilla.org/r/195536/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/195536/

Comment 2

[Michael Cooper [:mythmon]]

Rhelmer, can you flag this as r+ on reviewboard, so it can be autolanded?

Comment 3

[Robert Helmer [:rhelmer]]

Comment on attachment 8924296 [details]
Bug 1413673 - Sync shield recipe-client v78 from Github (commit 1553a2e)

https://reviewboard.mozilla.org/r/195536/#review208582

Comment 4

[Mozilla Autoland]

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 72dba2152cf9 -d e9c3828827e4: rebasing 435975:72dba2152cf9 "Bug 1413673 - Sync shield recipe-client v78 from Github (commit 1553a2e) r=rhelmer" (tip)
merging browser/extensions/shield-recipe-client/bootstrap.js
merging browser/extensions/shield-recipe-client/install.rdf.in
merging browser/extensions/shield-recipe-client/test/browser/browser_bootstrap.js
warning: conflicts while merging browser/extensions/shield-recipe-client/bootstrap.js! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/extensions/shield-recipe-client/install.rdf.in! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

Comment 5

[Michael Cooper [:mythmon]]

Comment on attachment 8924296 [details]
Bug 1413673 - Sync shield recipe-client v78 from Github (commit 1553a2e)

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/195536/diff/1-2/

Comment 6

[Michael Cooper [:mythmon]]

After reviewing this further, I realize that changes that landed as a part of the 57 launch invalidate this patch. I'll file a new bug with a better sync patch later.