Skip to content

Remove Gutenberg Video block from excerpt to hide VideoPress URLs #22713

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.

Sign up for GitHub

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

Merged
SiobhyB merged 5 commits into from
Mar 1, 2024
Merged

Remove Gutenberg Video block from excerpt to hide VideoPress URLs #22713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dba574e
chore: Update reference to WordPressShared branch
SiobhyB Feb 27, 2024
643b461
chore: Update WordPressShared ref
SiobhyB Mar 1, 2024
5d320ce
Merge branch 'trunk' into gutenberg/excerpt-strip-videopress-block
SiobhyB Mar 1, 2024
cf69345
chore: Fix reference in Podfile.lock
SiobhyB Mar 1, 2024
58dbc15
chore: Update after `bundle exec pod install`
SiobhyB Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ workspace 'WordPress.xcworkspace'
## ===================================
##
def wordpress_shared
pod 'WordPressShared', '~> 2.3'
Copy link
Contributor Author

@SiobhyB SiobhyB Mar 1, 2024

Choose a reason for hiding this comment

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

I looked at the last couple of times this reference, which was in #22376 and #20511. From those PRs, I see only the commit hash was updated in the main PR, then apps infra later created a release tag in 7fe3947 and d288944.

@mokagio, is this approach the right one? I've followed that lead with this PR, but would be keen to learn if I should have done something differently here. Thank you!

# pod 'WordPressShared', '~> 2.3'
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', tag: ''
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: 'trunk'
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: ''
pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: '0a14bc96e22f097eca99eeccf37b5de11fa62612'
# pod 'WordPressShared', path: '../WordPress-iOS-Shared'
end

Expand Down
14 changes: 9 additions & 5 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,12 @@ DEPENDENCIES:
- WordPress-Editor-iOS (~> 1.19.9)
- WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `000cbf2b3b1644b224eb46f14f1cfc609103f686`)
- WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `40d6a9f4928b470d73a5ade7ff1842a29e80cef8`)
- WordPressShared (~> 2.3)
- WordPressShared (from `https://github.com/wordpress-mobile/WordPress-iOS-Shared.git`, commit `0a14bc96e22f097eca99eeccf37b5de11fa62612`)
- WordPressUI (~> 1.15)
- ZendeskSupportSDK (= 5.3.0)
- ZIPFoundation (~> 0.9.8)

SPEC REPOS:
https://github.com/wordpress-mobile/cocoapods-specs.git:
- WordPressShared
trunk:
- Alamofire
- AlamofireImage
Expand Down Expand Up @@ -179,6 +177,9 @@ EXTERNAL SOURCES:
WordPressKit:
:commit: 40d6a9f4928b470d73a5ade7ff1842a29e80cef8
:git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
WordPressShared:
:commit: 0a14bc96e22f097eca99eeccf37b5de11fa62612
:git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git

CHECKOUT OPTIONS:
FSInteractiveMap:
Expand All @@ -190,6 +191,9 @@ CHECKOUT OPTIONS:
WordPressKit:
:commit: 40d6a9f4928b470d73a5ade7ff1842a29e80cef8
:git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
WordPressShared:
:commit: 0a14bc96e22f097eca99eeccf37b5de11fa62612
:git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git

SPEC CHECKSUMS:
Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7
Expand Down Expand Up @@ -223,7 +227,7 @@ SPEC CHECKSUMS:
WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef
WordPressAuthenticator: ba69878bfa1368636e92d29fcfb5bd1e0a11a3ef
WordPressKit: f446e322a67949d760629ed430589975ca5b9d71
WordPressShared: cad7777b283d3ce2752f283df587342a581cd49b
WordPressShared: f99faa127509b666d2f8b931989a900e2fd9d10d
WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5
Expand All @@ -235,6 +239,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced

PODFILE CHECKSUM: a5f578243c785e0c38eb87f15a7c1063db575bee
PODFILE CHECKSUM: 70c703d9dea1af3e9a7d9dd82484925dcab05711

COCOAPODS: 1.14.2