Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.org Plans: Use site.domain instead of slugToUrl helper #9338

Merged
merged 1 commit into from
Nov 16, 2016

Conversation

tyxla
Copy link
Member

@tyxla tyxla commented Nov 14, 2016

Reverts #9207 and uses site.domain instead of the slugToUrl helper that was previously introduced. Props to @mtias for noticing this.

There should be no observable changes or regressions caused by this PR.

To test:

  • Checkout this branch
  • Purchase a plan for a Jetpack site which is installed in a subdirectory
  • Go through the process of canceling the plan
  • Verify the site slug is displayed with / and not with :: in the "Are you sure you want to remove {PLAN} from {SLUG}" text in the removal step
  • Verify the site slug is displayed with / and not with :: in the "{PLAN} was removed from {SLUG}" text in the removal confirmation notice.

/cc @beaulebens @johnHackworth @mtias

@tyxla tyxla added .org Plans Jetpack [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it labels Nov 14, 2016
@tyxla tyxla self-assigned this Nov 14, 2016
@matticbot
Copy link
Contributor

@tyxla tyxla added the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Nov 14, 2016
@beaulebens
Copy link
Member

This tests nicely for me. Confirmed that the URLs show up properly.

@mtias
Copy link
Member

mtias commented Nov 16, 2016

Thanks! Looks good to me once you fix the merge conflict.

@tyxla tyxla force-pushed the update/use-domain-instead-of-slugtourl branch from 2659200 to 8025356 Compare November 16, 2016 13:16
@tyxla tyxla added [Status] Ready to Merge and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Nov 16, 2016
@tyxla tyxla merged commit 78db8cc into master Nov 16, 2016
@tyxla tyxla deleted the update/use-domain-instead-of-slugtourl branch November 16, 2016 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Jetpack [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants