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

[docs] add documentation on how to make a Pr with Gitpod. #1262

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
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
40 changes: 37 additions & 3 deletions content/docs/user-guide/contributing/docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,45 @@ We will review your PR as soon as possible. Thank you for contributing!

## Development environment

We highly recommend running this web app locally to check documentation or blog
changes before submitting them, and it's quite necessary when making changes to
the website engine itself. Source code and content files need to be properly
We highly recommend running this web app to check documentation or blog changes
before submitting them, and it's quite necessary when making changes to the
website engine itself. Source code and content files need to be properly
formatted and linted as well, which is also ensured by the full setup below.

> ⚡ You can create a dev env online using Gitpod (a fully featured online IDE),
> it'll automatically clone the repo, install the dependencies, and run the app
> (takes a few minutes), so that you can start straight away.
>
> <a href="https://gitpod.io/#https://github.com/iterative/dvc.org">
> <img src="https://gitpod.io/button/open-in-gitpod.svg" alt="Open in Gitpod">
> </a>

<details>

### How to make a Pull Request with Gitpod?
Copy link
Member

Choose a reason for hiding this comment

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

@jorgeorpinel @nisarhassan12 feels it's not a good place for very long instructions like this in this doc, sorry. It's a good thing to mention that there is a possibility, may be provide the button, but docs like this should be maintained but the Gitpod, not us.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@shcheklein I agree. Making Prs with Gitpod is briefly documented here https://www.gitpod.io/docs/pull-requests/ should I update the Pr to only have the link instead ?

Copy link
Member

Choose a reason for hiding this comment

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

@nisarhassan12 I'll let @jorgeorpinel decide on this :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok. Thanks.

Copy link
Contributor

@jorgeorpinel jorgeorpinel May 8, 2020

Choose a reason for hiding this comment

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

Hmm I thought the expandable section would be appropriate for this (I would just put it inside the block quote). But indeed we shouldn't have to maintain Gitpod instructions that may change in the future... Sorry, I guess I didn't think it through. Let me think... ⏳

Copy link
Contributor

@jorgeorpinel jorgeorpinel May 8, 2020

Choose a reason for hiding this comment

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

I guess we could just link to https://www.gitpod.io/docs/git/ and https://www.gitpod.io/docs/pull-requests/ but the forking part is not mentioned anywhere unfortunately, which is my main concern.

We cold also have a separate user-guide like we have on some 3rd party tools e.g. https://dvc.org/doc/user-guide/setup-google-drive-remote or https://dvc.org/doc/user-guide/running-dvc-on-windows

I supose it'll be easier for me to take over this PR. Thanks for your contributions so far Nisar! (I hope you enabled repo maintainers to push to the PR branch 🙂)

Copy link
Contributor

Choose a reason for hiding this comment

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

p.s. please notice my feature request in your repo @nisarhassan12 thanks: gitpod-io/gitpod/issues/1482

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok. Thanks.

Copy link
Contributor Author

@nisarhassan12 nisarhassan12 May 10, 2020

Choose a reason for hiding this comment

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

p.s. please notice my feature request in your repo @nisarhassan12 thanks: gitpod-io/gitpod/issues/1482

@jorgeorpinel I'm not sure about this I think I have not unchecked the following while making the PR:

image

Please let me know if you are not able to push to my branch.


- Fork the repo by selecting Find Command from View in the top menu and then
type fork and press enter:

![image](https://user-images.githubusercontent.com/46004116/76392493-75727880-6393-11ea-8939-41e6c36477de.png)
Copy link
Member

Choose a reason for hiding this comment

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

We should host these images on the dvc.org (e.g. to process them properly with sharp)? not sure what are the consequences of sharing it like this. Btw, @nisarhassan12 how did you create them?

Copy link
Contributor

@jorgeorpinel jorgeorpinel May 9, 2020

Choose a reason for hiding this comment

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

I think he pasted them into a Github issue or comment like this:

image

![image](https://user-images.githubusercontent.com/1477535/81460584-e2c04100-916b-11ea-86b6-6f36b0317bac.png)

Copy link
Contributor

Choose a reason for hiding this comment

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

Which is interesting. I wonder it Github ever deletes images from it's CDN.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah! True I pasted them in Github comment. Sorry, this is a bad idea.


- You can commit your changes either using a the `git` cli or using the GUI in
the top left tab under search as shown below:

![image](https://user-images.githubusercontent.com/46004116/76298550-6fb95c00-62db-11ea-9fda-f4e8c0840e69.png)

- Once you are done commiting your changes you can push the code via using push
button from the GitHub tab in the top right corner as shown:

![image](https://user-images.githubusercontent.com/46004116/76299985-c9228a80-62dd-11ea-930c-00eb22156c9e.png)

- Once you have made all the changes and pushed them to your fork. You can make
PR from the same GitHub tab in top right corner as shown:

![image](https://user-images.githubusercontent.com/46004116/76300458-9036e580-62de-11ea-8f24-ebaa664204ce.png)

</details>

Make sure you have a recent LTS version of [Node.js](https://nodejs.org/en/)
(`>=12.0.0`), and install [Yarn](https://yarnpkg.com/):

Expand Down