Skip to content

Docs: A wether, as it turns out, is a castrated ram#28008

Merged
ockham merged 7 commits intoWordPress:masterfrom
zao-web:master
Jan 8, 2021
Merged

Docs: A wether, as it turns out, is a castrated ram#28008
ockham merged 7 commits intoWordPress:masterfrom
zao-web:master

Conversation

@JustinSainton
Copy link
Contributor

Description

A simple documentation change, updating several instances of a mis-applied word throughout the codebase.

How has this been tested?

Nothing functional changed, only documentation.

Types of changes

Only docs.

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • My code follows the accessibility standards.
  • My code has proper inline documentation.
  • I've included developer documentation if appropriate.
  • I've updated all React Native files affected by any refactorings/renamings in this PR.

@github-actions github-actions bot added the First-time Contributor Pull request opened by a first-time contributor to Gutenberg repository label Jan 6, 2021
@Soean Soean added the [Type] Developer Documentation Documentation for developers label Jan 6, 2021
Copy link
Contributor

@ockham ockham left a comment

Choose a reason for hiding this comment

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

Thanks for this! The title made my day 🐏 😆

Copy link
Contributor

@ockham ockham left a comment

Choose a reason for hiding this comment

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

Oh, I just noticed that the Static Analysis CI job is actually complaining about the removal of the (auto-generated) whitespace after "void:"

@ockham
Copy link
Contributor

ockham commented Jan 6, 2021

Thanks for addressing!

The remaining error in the Static Analysis workflow seems unrelated:

 75:4  error  Deprecated functions must be removed before releasing this version  no-restricted-syntax

referring to this:

deprecated( 'leftSidebar prop in InterfaceSkeleton component', {
alternative: 'secondarySidebar prop',
version: '9.7.0',
plugin: 'Gutenberg',
} );

I'll investigate some more tomorrow!

cc/ @youknowriad

@ockham
Copy link
Contributor

ockham commented Jan 6, 2021

I've filed an issue here: #28027

@ockham
Copy link
Contributor

ockham commented Jan 7, 2021

#28027 has been fixed. @JustinSainton Can you rebase the branch on latest master? That should fix the issue 🙂

@JustinSainton
Copy link
Contributor Author

#28027 has been fixed. @JustinSainton Can you rebase the branch on latest master? That should fix the issue 🙂

sure thing, should be square now! watching the checks with baited breath 🍿

@ockham
Copy link
Contributor

ockham commented Jan 8, 2021

Hmm, looks like the rebase didn't produce quite the right result 😅

image

I'll have another stab at it if you don't mind 😄

@ockham
Copy link
Contributor

ockham commented Jan 8, 2021

Hmm, looks like the rebase didn't produce quite the right result

image

I'll have another stab at it if you don't mind

Ah, I'd missed that this branch is in a fork of the Gutenberg repo (zao-web) to which I don't have write access 😅

@JustinSainton Can you try the following for me? On the zao-web master branch,

git fetch upstream
git rebase upstream/master
git push --force-with-lease

(assuming that you have added the original Gutenberg repo as your upstream remote. If you haven't, you can do so via git add remote upstream git@github.com:WordPress/gutenberg.git.)

@gziolo
Copy link
Member

gziolo commented Jan 8, 2021

The more detailed docs related to updating your branch when using a fork can be found at:
https://github.com/WordPress/gutenberg/blob/master/docs/contributors/git-workflow.md#keeping-your-fork-up-to-date

@JustinSainton
Copy link
Contributor Author

The more detailed docs related to updating your branch when using a fork can be found at:
https://github.com/WordPress/gutenberg/blob/master/docs/contributors/git-workflow.md#keeping-your-fork-up-to-date

Reading this now - thanks so much for that, @gziolo!

Hmm, looks like the rebase didn't produce quite the right result
image
I'll have another stab at it if you don't mind

Ah, I'd missed that this branch is in a fork of the Gutenberg repo (zao-web) to which I don't have write access 😅

@JustinSainton Can you try the following for me? On the zao-web master branch,

git fetch upstream
git rebase upstream/master
git push --force-with-lease

(assuming that you have added the original Gutenberg repo as your upstream remote. If you haven't, you can do so via git add remote upstream git@github.com:WordPress/gutenberg.git.)

Giving that a go now!

Thank you both for your patience - it's a goal of mine to contribute to Gutenberg more this year, so getting past some of these initial hurdles is hugely helpful. Thank you!

@gziolo gziolo changed the title A wether, as it turns out, is a castrated ram Docs: A wether, as it turns out, is a castrated ram Jan 8, 2021
@ockham
Copy link
Contributor

ockham commented Jan 8, 2021

Giving that a go now!

Seems to have worked now 🎉 Lookin' good!

Thank you both for your patience - it's a goal of mine to contribute to Gutenberg more this year, so getting past some of these initial hurdles is hugely helpful. Thank you!

Thank you -- and welcome to Gutenberg! Looking forward to having you join the party 🥳

@ockham ockham merged commit 68da0d9 into WordPress:master Jan 8, 2021
@github-actions
Copy link

github-actions bot commented Jan 8, 2021

Congratulations on your first merged pull request, @JustinSainton! We'd like to credit you for your contribution in the post announcing the next WordPress release, but we can't find a WordPress.org profile associated with your GitHub account. When you have a moment, visit the following URL and click "link your GitHub account" under "GitHub Username" to link your accounts:

https://profiles.wordpress.org/me/profile/edit/

And if you don't have a WordPress.org account, you can create one on this page:

https://login.wordpress.org/register

Kudos!

@github-actions github-actions bot added this to the Gutenberg 9.8 milestone Jan 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

First-time Contributor Pull request opened by a first-time contributor to Gutenberg repository [Type] Developer Documentation Documentation for developers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants