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.

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

Jump to bottom

docs: Revert all changes after the license change #17227

Merged
merged 1 commit into from Jun 5, 2023
Merged

docs: Revert all changes after the license change #17227

merged 1 commit into from Jun 5, 2023

Conversation

mdjermanovic
Copy link
Member

@mdjermanovic mdjermanovic commented May 27, 2023 •
edited

Prerequisites checklist

What is the purpose of this pull request? (put an "X" next to an item)

[ ] Documentation update
[ ] Bug fix (template)
[ ] New rule (template)
[ ] Changes an existing rule (template)
[ ] Add autofix to a rule
[ ] Add a CLI option
[ ] Add something to the core
[ ] Other, please explain:

Refs #17225, fixes step 2.

What changes did you make? (Give an overview)

Checked out b3634f6 and copied its docs/ folder over the current one.

Is there anything you'd like reviewers to focus on?

This reverts all docs changes after b3634f6, including the bot's and team members' commits. Is that okay?

Also, this reverts only docs parts of the commits. For example, 880a431 had changes in both code and docs. Its code changes will stay, while the docs changes will be removed. Is that okay?

@mdjermanovic mdjermanovic added the documentation Relates to ESLint's documentation label May 27, 2023
@mdjermanovic mdjermanovic requested a review from a team as a code owner May 27, 2023 18:15
@netlify
Copy link

netlify bot commented May 27, 2023 •
edited

✅ Deploy Preview for docs-eslint ready!

Name Link
🔨 Latest commit dcf3c72
🔍 Latest deploy log https://app.netlify.com/sites/docs-eslint/deploys/6475acb16895ff000828d31c
😎 Deploy Preview https://deploy-preview-17227--docs-eslint.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@mdjermanovic mdjermanovic mentioned this pull request May 27, 2023
Closed
@amareshsm
Copy link
Member

amareshsm commented May 27, 2023 •
edited

Also, this reverts only docs parts of the commits. For example, 880a431 had changes in both code and docs. Its code changes will stay, while the docs changes will be removed. Is that okay?

After reverting this PR are we immediately going to resubmit the removed documentation? boz If we revert docs changes alone then the code and docs will be inconsistent right?

@amareshsm amareshsm added the accepted There is consensus among the team that this change meets the criteria for inclusion label May 27, 2023
nzakas
nzakas requested changes May 29, 2023
View reviewed changes
Copy link
Member

@nzakas nzakas 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 going through and doing this.

I started leaving notes on each file, but basically we just need to revert the *.md files, as those are the only ones that contain documentation. All of the other file types are covered under the MIT license only and we should leave as-is.

docs/package.json Outdated
@@ -1,7 +1,7 @@
{
"name": "docs-eslint",
"private": true,
"version": "8.41.0",
"version": "8.36.0",
Copy link
Member

Choose a reason for hiding this comment

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

I think we probably want to keep this at 8.41.0 to match the ESLint version?

docs/src/_data/sites/en.yml Outdated
@@ -85,7 +85,6 @@ footer:
description: Selecting a language will take you to the ESLint website in that language.
change_language: Change Language
language: Language
latest: Latest
Copy link
Member

Choose a reason for hiding this comment

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

I think we need to keep this?

docs/src/_data/sites/zh-hans.yml Outdated
@@ -83,7 +83,6 @@ footer:
description: 切换到你所选择语言版本对应的 ESLint 网站。
change_language: 更改语言
language: 语言
latest: 最新
Copy link
Member

Choose a reason for hiding this comment

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

Ditto

docs/src/_includes/components/language-switcher.html Outdated
Copy link
Member

Choose a reason for hiding this comment

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

Safe to keep

docs/src/_includes/layouts/base.html Outdated
Copy link
Member

Choose a reason for hiding this comment

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

Safe to keep

docs/src/_includes/layouts/doc.html Outdated
Copy link
Member

Choose a reason for hiding this comment

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

Safe to keep

docs/src/assets/js/scroll-up-btn.js Outdated
Copy link
Member

Choose a reason for hiding this comment

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

Safe to Keep

docs/src/assets/scss/components/alert.scss Outdated
Copy link
Member

Choose a reason for hiding this comment

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

Safe to keep

@mdjermanovic mdjermanovic force-pushed the revert-docs-since-license-change branch from a3df557 to dcf3c72 Compare May 30, 2023 07:58
@mdjermanovic
Copy link
Member Author

but basically we just need to revert the *.md files

Done. This now includes only docs/**/*.md files changed in b3634f6...f67d298

@mdjermanovic mdjermanovic mentioned this pull request May 30, 2023
Merged
aladdin-add
aladdin-add approved these changes May 30, 2023
View reviewed changes
Copy link
Member

@aladdin-add aladdin-add left a comment

Choose a reason for hiding this comment

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

LGTM, thanks! 👍

@aladdin-add aladdin-add requested a review from nzakas May 30, 2023 12:03
nzakas
nzakas approved these changes May 30, 2023
View reviewed changes
Copy link
Member

@nzakas nzakas left a comment

Choose a reason for hiding this comment

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

LGTM. Just leaving open so we can coordinate how we want to merge this in.

@mdjermanovic mdjermanovic merged commit 3ef5814 into main Jun 5, 2023
22 checks passed
@mdjermanovic mdjermanovic deleted the revert-docs-since-license-change branch June 5, 2023 20:48
This was referenced Jun 8, 2023
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
@mlwyatt mlwyatt mentioned this pull request Jun 9, 2023
Merged
1 task
@eslint-github-bot eslint-github-bot bot locked and limited conversation to collaborators Dec 3, 2023
@eslint-github-bot eslint-github-bot bot added the archived due to age This issue has been archived; please open a new issue for any further discussion label Dec 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@nzakas nzakas nzakas approved these changes

@aladdin-add aladdin-add aladdin-add approved these changes

Assignees
No one assigned
Labels
accepted There is consensus among the team that this change meets the criteria for inclusion archived due to age This issue has been archived; please open a new issue for any further discussion documentation Relates to ESLint's documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mdjermanovic @amareshsm @nzakas @aladdin-add