Skip to content
This repository has been archived by the owner. It is now read-only.

feat(marketing): Enable Marketing Email prefs for more users. #25

Merged
merged 1 commit into from Oct 19, 2015

Conversation

@shane-tomlinson
Copy link
Member

@shane-tomlinson shane-tomlinson commented Jul 26, 2015

issue mozilla/fxa-content-server#2676

@rfk - Whether this merges is dependent on the response to https://bugzilla.mozilla.org/show_bug.cgi?id=1179873#c3. If Basket handles all of this correctly from fxa-register, hooray, we can merge. If we have to pass along the user's language to the /subscribe basket endpoint, we'll have to hold off until that work is complete.

@rfk
Copy link
Member

@rfk rfk commented Aug 2, 2015

I'm r+ on the change here, but we'll hold off merge until mozilla/fxa-content-server#2676 gets resolved.

@rfk
Copy link
Member

@rfk rfk commented Sep 25, 2015

The supporting code for this is now merged and will go out with train-47.

@vladikoff
Copy link
Contributor

@vladikoff vladikoff commented Oct 5, 2015

once trian 47 is live will be merged

@rfk
Copy link
Member

@rfk rfk commented Oct 16, 2015

once trian 47 is live will be merged

Oh hey, train-47 is live! This is good to go, but I don't want to merge it last thing on a Friday evening and have the change go straight to production - let's deal with it on Monday when prepping the cut for train-48.

@shane-tomlinson
Copy link
Member Author

@shane-tomlinson shane-tomlinson commented Oct 16, 2015

Oh hey, train-47 is live! This is good to go, but I don't want to merge it last thing on a Friday evening and have the change go straight to production - let's deal with it on Monday when prepping the cut for train-48.

We should be good to merge, the merge goes to dev. Whenever new experiments are merged, a new branch is created for that train, which is then used until a new experiment is added.

As an aside, @jrgm, @vladikoff, @rfk, @dannycoates - I find it really difficult to keep track of which repos use which process for marking a sha as "used by train XX". Some repos use branches, some tags, others, like this repo, cut a new branch only whenever the experiments change. Can we settle on one process, to use everywhere? Branch or tag on every train, even if there are no updates. A unified, well-understood process may have prevented the fxa-content-server-l10n mixup last week, and would prevent confusion like such as whether we should wait to merge this PR now or on Monday.

@rfk
Copy link
Member

@rfk rfk commented Oct 19, 2015

Whenever new experiments are merged, a new branch is created for that train,
which is then used until a new experiment is added.

OK, cool, thanks @shane-tomlinson. I do remember this discussion, but I don't recall the details of the outcomes and it's not obvious to me where I'd go to discover the process. I filed #29 for us to remember to do something about that.

Merging.

rfk added a commit that referenced this pull request Oct 19, 2015
feat(marketing): Enable Marketing Email prefs for users in more languages.
@rfk rfk merged commit a2f4599 into dev Oct 19, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@rfk rfk removed the waffle:review label Oct 19, 2015
@shane-tomlinson shane-tomlinson deleted the more-email-optin-languages branch Oct 19, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants