Skip to content

Conversation

@brbrr
Copy link
Contributor

@brbrr brbrr commented Jul 31, 2020

Fixes #16647

Changes proposed in this Pull Request:

  • Hide Ads.txt section completely for subdir sites

Jetpack product discussion

n/a

Does this pull request change what data or activity we track or use?

n/a

Testing instructions:

  • Use subdir site

  • Enable WordAds on your site

  • Go to /wp-admin/admin.php?page=jetpack#/traffic

  • Make sure that Ads.txt section is not present, and there are no placeholders is present.

  • Use singlesite site (🤦 )

  • Enable WordAds on your site

  • Go to /wp-admin/admin.php?page=jetpack#/traffic

  • Make sure that Ads.txt section is present, and there are no placeholders is present.

Before:
image

After:
Jetpack ‹ Testing Jetpack on GoDaddy (subdir) — WordPress 2020-07-31 16-57-59

Proposed changelog entry for your changes:

  • Hide Ads.txt settings section for subdirectory sites

@brbrr brbrr added [Type] Bug When a feature is broken and / or not performing as intended [Status] Needs Review This PR is ready for review. [Feature] WordAds labels Jul 31, 2020
@brbrr brbrr self-assigned this Jul 31, 2020
@jetpackbot
Copy link
Collaborator

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

E2E results is available here (for debugging purposes): https://jetpack-e2e-dashboard.herokuapp.com/pr-16671

Scheduled Jetpack release: August 4, 2020.
Scheduled code freeze: July 28, 2020

Generated by 🚫 dangerJS against 188319a

@brbrr brbrr requested a review from jeherve July 31, 2020 14:18
@jeherve jeherve added the Admin Page React-powered dashboard under the Jetpack menu label Jul 31, 2020
@jeherve jeherve added this to the 8.9 milestone Jul 31, 2020
@jeherve jeherve added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review This PR is ready for review. labels Jul 31, 2020
Copy link
Member

@jeherve jeherve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works well in my tests.

@brbrr brbrr merged commit 687175a into master Aug 3, 2020
@brbrr brbrr deleted the fix/hide-ads.txt-on-subdir-completely branch August 3, 2020 14:51
@matticbot matticbot added [Status] Needs Changelog and removed [Status] Ready to Merge Go ahead, you can push that green button! labels Aug 3, 2020
davidlonjon added a commit that referenced this pull request Aug 6, 2020
…ic/jetpack into add/jetpack-lazy-images-package

* 'add/jetpack-lazy-images-package' of github.com:Automattic/jetpack: (40 commits)
  Lodash: Revert to previous version (#16735)
  New class to handle async XML-RPC requests (#16674)
  Social Previews: Sidebar design updates (#16725)
  Update E2E locator for classic connection flow (#16708)
  Woo Services: update to use existing Jetpack plugin install tools (#16672)
  Admin Page: avoid blank dashboard when notice is not a string (#16721)
  Admin Page: update string still using old i18n format (#16722)
  Social Previews: Add sidebar UI (#16633)
  Fix recurring payments block disconnecting (sometimes) when existing article is reopened in block editor. (#16640)
  Connection Register: Add current user email to connection register request (#16712)
  Update versions to start 8.9 Release cycle (#16706)
  Donations block: Make currency and amounts editable (#16593)
  Update dependency @automattic/calypso-color-schemes to v2
  Error Notice: removing HTML code, adjusting maximum width. (#16690)
  Update dependency swiper to v6 (#16587)
  Site Scan: Short-circuit update_threats_link() if Admin Bar is not present (#16677)
  Update vulnerable NPM packages (#16659)
  E2E Tests: Add Jetpack updater test (#16437)
  check for subdir site before rendering Ads.txt section (#16671)
  VideoPress Block: Retain alignment support (#16651)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Admin Page React-powered dashboard under the Jetpack menu [Feature] WordAds [Type] Bug When a feature is broken and / or not performing as intended

Projects

None yet

Development

Successfully merging this pull request may close these issues.

WordAds Settings: Empty settings section on subdir sites

5 participants