Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

magento/devdocs#5245: Hard tabs. Folder: guides/cloud #5471

Conversation

atwixfirster
Copy link
Contributor

@atwixfirster atwixfirster commented Sep 24, 2019

Purpose of this pull request

This pull request (PR) is related to #5245: in the folder: guides/cloud (v.2.2 and v.2.3)

@meker12 , could you please review!

Affected DevDocs pages

  • ...

Links to Magento source code

  • ...

Thank you!

@devops-devdocs
Copy link
Collaborator

An admin must run tests on this PR before it can be merged.

@dobooth dobooth requested a review from meker12 September 24, 2019 19:40
Copy link
Contributor

@hguthrie hguthrie left a comment

Choose a reason for hiding this comment

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

Care must be taken about code blocks and images and other paragraphs inside of lists. This breaks many ordered lists because the code blocks and the images are flush left. It is not enough to remove hard tabs, you may have to add spacing back in so that these types of elements align properly.

Copy link
Contributor

@meker12 meker12 left a comment

Choose a reason for hiding this comment

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

@atwixfirster Like @hguthrie mentioned. I flagged one file where it's easy to see the misalignment. We can review again after you fix. Thx.

@hguthrie
Copy link
Contributor

The following screenshot shows the result of removing hard spaces from an ordered list with images in a step:

Screen Shot 2019-09-24 at 14 42 00

As you can see, the alignment is off and the list numbering starts over.

@atwixfirster
Copy link
Contributor Author

atwixfirster commented Sep 24, 2019

The following screenshot shows the result of removing hard spaces from an ordered list with images in a step:

Screen Shot 2019-09-24 at 14 42 00

As you can see, the alignment is off and the list numbering starts over.

@hguthrie , could you please verify if guides/v2.2/cloud/before/before-setup-env-2_clone.md looks ok?

I will implement the same styles to the rest pages.

Thank you!

@hguthrie
Copy link
Contributor

@hguthrie , could you please verify if guides/v2.2/cloud/before/before-setup-env-2_clone.md looks ok?

I will implement the same styles to the rest pages.

Thank you!

@atwixfirster Yes! The topic you fixed looks like it should; the ordered lists are ordered. That is a great help to us. 😄 You're on the right track. If you run into anything weird in fixing the remaining topics, feel free to ask us about it.

@atwixfirster
Copy link
Contributor Author

@hguthrie, PR is ready for your review.

Many thanks!

@hguthrie
Copy link
Contributor

@atwixfirster Okay. At the moment, your branch fails the markdown linter test.
The Cloud guide has received a lot of updates associated with procedure headings, so I fixed the conflicts associated with that but that only helped a little. You may want to run another test.

@atwixfirster
Copy link
Contributor Author

@atwixfirster Okay. At the moment, your branch fails the markdown linter test.
The Cloud guide has received a lot of updates associated with procedure headings, so I fixed the conflicts associated with that but that only helped a little. You may want to run another test.

Could you please attach a report with issues?

Thanks!

@hguthrie
Copy link
Contributor

@atwixfirster It is best if you run the preview and tests in your local environment. Follow the steps defined in the GitHub issue 5245.

@hguthrie hguthrie added the Editorial Typo and grammar fixes or minor rewrites to correct inaccuracies label Sep 26, 2019
@atwixfirster
Copy link
Contributor Author

@atwixfirster It is best if you run the preview and tests in your local environment. Follow the steps defined in the GitHub issue 5245.

@hguthrie , could you please run tests again?

Thank you!

@hguthrie
Copy link
Contributor

@atwixfirster I am seeing artifacts from previous merges to master. And I am seeing changes that have nothing to do with hard tabs. This could be a result of rebasing, but, whatever the issue, we cannot merge this PR and risk the impact to the Cloud guide.

@atwixfirster
Copy link
Contributor Author

atwixfirster commented Sep 27, 2019

This could be a result of rebasing, but, whatever the issue, we cannot merge this PR and risk the impact to the Cloud guide.

@hguthrie , I hope you are joking...

You requested to fix content after remove hard tabs. And I did that. Now you tell me what you can not merge this PR.

!!!

Please tell me that the last your message was a joke.

Thank you!

@hguthrie
Copy link
Contributor

Hey Alex, I am not joking, in fact! There are changes in this PR that are not related to the hard tabs issue. Because of the nature of this infrastructure work, we can only accept changes in this PR related to hard tabs.

I know you have worked hard to revisit the changes in Cloud guide, and the changes to ordered lists appear to be fine. The earlier tests were failing because of spacing inserted into blank lines before and after code blocks. However, I reviewed it again and I am still not able to approve this PR for merge. For example, some YAML samples were reformatted with the incorrect spacing, some unnecessary spaces were added to em dashes in lists. I see changes to lexers for some Code blocks, too. These are changes that are not related to the Hard Tab rule issue.

If you’d like to remove changes not applicable to the related issue, I can re-review for merging. Or, if you’d rather start fresh, we can do that too. Please close this and submit another PR.

@jeff-matthews jeff-matthews changed the base branch from master to db_hardtab_integration October 2, 2019 15:22
@jeff-matthews
Copy link
Contributor

Ordinarily, I would agree with @hguthrie that we should limit the scope of PRs. However, these markdown linting issues are unique.

We (the Magento Docs team) didn't provide sufficient info in the issue to warn contributors about scope, so I'm going to let that slide for this PR.

@atwixfirster, if you will resolve the merge conflicts, I'll re-review your PR. This should resolve all the remaining MD010 errors that are left, which will allow us to enable the rule on production and start making progress on the next linting rule.

Merge remote-tracking branch 'upstream/master' into hard-tabs-guides-cloud

# Conflicts:
#	guides/v2.2/cloud/cdn/cloud-fastly-custom-response.md
#	guides/v2.2/cloud/cdn/configure-fastly.md
#	guides/v2.2/cloud/cdn/fastly-vcl-wordpress.md
#	guides/v2.2/cloud/requirements/cloud-requirements.md
#	guides/v2.3/cloud/requirements/cloud-requirements.md
#	guides/v2.3/cloud/setup/first-time-deploy.md
@atwixfirster
Copy link
Contributor Author

@atwixfirster, if you will resolve the merge conflicts, I'll re-review your PR.

@jeff-matthews you are the man with a BIG heart. I put a lot of my time to this one.

I've resolved conflicts. Could you please review?

Thank you!

Copy link
Contributor

@jeff-matthews jeff-matthews left a comment

Choose a reason for hiding this comment

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

@atwixfirster, I reviewed your changes and I only have a few comments.

I also see unexpected commits from PRs that were merged to master yesterday. @atwixfirster, did you rebase your branch at some point?

@hguthrie & @meker12, please verify that the YAML spacing is correct in the guides/v2.2/cloud/configure/import-url-rewrites.md file.

@atwixfirster
Copy link
Contributor Author

I also see unexpected commits from PRs that were merged to master yesterday. @atwixfirster, did you rebase your branch at some point?

@jeff-matthews , current branch was created from master. So, yesterday I used the latest updates from master branch.

Did I do something wrong?

Thank you!

@jeff-matthews
Copy link
Contributor

I'm not sure. If you rebased after someone else edited your branch, then maybe.

We periodically sync the integration branch with master, so even if you created a working branch from a more recent version of master, those commits should go away after we sync the integration branch.

@jeff-matthews jeff-matthews changed the base branch from db_hardtab_integration to master October 3, 2019 13:15
@jeff-matthews jeff-matthews changed the base branch from master to db_hardtab_integration October 3, 2019 13:15
@jeff-matthews
Copy link
Contributor

Ok, those commits are now gone. I think this is a result of some idiosyncratic behavior in GitHub.

This PR originally used master as the base branch, but I changed it yesterday to the integration branch. Sometimes, we have to toggle the base branch back and forth to ensure that only the commits from your branch are showing up in the PR.

@jeff-matthews jeff-matthews merged commit 73fb89b into magento:db_hardtab_integration Oct 3, 2019
@ghost
Copy link

ghost commented Oct 3, 2019

Hi @atwixfirster, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@jeff-matthews
Copy link
Contributor

Thanks @atwixfirster!

@atwixfirster
Copy link
Contributor Author

atwixfirster commented Oct 3, 2019

Thanks @atwixfirster!

Thank you @jeff-matthews , for your support here!

Also thank you goes to @meker12 and @hguthrie !

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Editorial Typo and grammar fixes or minor rewrites to correct inaccuracies Partner: Atwix partners-contribution PR created by Magento partner
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants