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

fix a bug of legacy http:// URL references #1439

Merged
merged 2 commits into from
Jul 7, 2021

Conversation

peterbe
Copy link
Contributor

@peterbe peterbe commented Jul 7, 2021

No description provided.

@peterbe peterbe requested review from a team as code owners July 7, 2021 16:23
@peterbe peterbe requested review from M1B4ND, dynamis, hochan222, clovislima, yanaklose and irvin and removed request for a team July 7, 2021 16:23
@peterbe
Copy link
Contributor Author

peterbe commented Jul 7, 2021

Sorry all reviewers pinged. Anybody can review this. And if you can merge, please go ahead and squash and merge.

@SphinxKnight SphinxKnight requested review from SphinxKnight and removed request for M1B4ND July 7, 2021 16:51
@irvin irvin merged commit 874d81c into mdn:main Jul 7, 2021
@peterbe peterbe deleted the fix-a-bug-of-legacy-http-url-references branch July 7, 2021 18:07
Copy link
Member

@hochan222 hochan222 left a comment

Choose a reason for hiding this comment

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

LGTM :)

@irvin
Copy link
Collaborator

irvin commented Jul 8, 2021

i had rebase merge instead of squash, due to one object per commit principle.

@peterbe
Copy link
Contributor Author

peterbe commented Jul 8, 2021

i had rebase merge instead of squash, due to one object per commit principle.

I don't understand. If you use "Squash and merge" that's actually a form of rebase too. But it makes it so there's only 1 commit.
If you use "Rebase and merge" it just pretends that all commits started from the tip of main but all commits are kept.

We use "Squash and merge" on mdn/content and mdn/yari.

@irvin
Copy link
Collaborator

irvin commented Jul 8, 2021

one commit is “fix http:// URL” and another commit is “remove wiki. prefixes”, i think it would be better to keep them separate and not merging into one commit because it’s actually two separate issues?

@peterbe
Copy link
Contributor Author

peterbe commented Jul 8, 2021

one commit is “fix http:// URL” and another commit is “remove wiki. prefixes”, i think it would be better to keep them separate and not merging into one commit because it’s actually two separate issues?

Fair! It was "sloppy" to fix two separate things in one PR.

Great work! ...as always. Please keep it up!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants