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

Create a general pull_request_template.md #703

Merged
merged 19 commits into from
Jul 6, 2021
Merged

Conversation

Thomas-Boi
Copy link
Member

This fixes #699.

Details:

  • I moved the current templates into a folder that won't trigger them on PR
  • I created a general template made up of these two files that should appear when a PR is opened.

Note:

  • The PR template will only appear when it's merged into master

Copy link
Member

@Panquesito7 Panquesito7 left a comment

Choose a reason for hiding this comment

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

Mostly, these are back-end Markdown suggestions.

.github/drafts/pull_request_template.md Outdated Show resolved Hide resolved
.github/drafts/pull_request_template.md Outdated Show resolved Hide resolved
.github/drafts/pull_request_template.md Outdated Show resolved Hide resolved
.github/drafts/pull_request_template.md Outdated Show resolved Hide resolved
.github/drafts/pull_request_template.md Outdated Show resolved Hide resolved
*List anything note-worthy here (potential issues, this needs to be merged to `master` before working, etc....).*
*Don't forget to link any issues that this PR will solved.*

**Please link any issue that this PR should solve if it's applicable**
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
**Please link any issue that this PR should solve if it's applicable**
<!-- Please link any issue that this PR solves if applicable -->

Comment on lines 43 to 44
*List anything note-worthy here (potential issues, this needs to be merged to `master` before working, etc....).*
*Don't forget to link any issues that this PR will solved.*
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
*List anything note-worthy here (potential issues, this needs to be merged to `master` before working, etc....).*
*Don't forget to link any issues that this PR will solved.*
<!-- List anything note-worthy here (potential issues, this needs to be merged to `master` before working, etc....).
Don't forget to link any issues that this PR will solve. -->

.github/drafts/PULL_REQUEST_TEMPLATE/new_feature.md Outdated Show resolved Hide resolved
- [] PR name matches the format *New Feature: brief description of feature*


## This PR adds/fixes...

*List your features here and the benefits they bring.*
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
*List your features here and the benefits they bring.*
<!-- List your features here and the benefits they bring. -->

Copy link
Member Author

Choose a reason for hiding this comment

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

Why do we comment out this line though? Shouldn't the user see this?

Copy link
Member

Choose a reason for hiding this comment

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

Why do we comment out this line, though? Shouldn't the user see this?

This works like in other programming languages: comments cannot be read by computers, but they can be read by the user. The purpose of the comments should only be read by the PR creator, not by other users. Hope I get to understand. 🙂

Copy link
Member Author

Choose a reason for hiding this comment

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

I think that line should be there as an instruction to people opening a PR into the repo. If it's only readable to us, people might get confused.

Will this line shows up when someone open a PR into the repo? If not, I think we should stick with the old one

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I think you misunderstood, sorry. 😅

When you use comments in Markdown, that's only readable when editing a comment or a Markdown file, but that can't be read when looking at the file/comment preview. Hope I get to understand now. 😅

Copy link
Member Author

Choose a reason for hiding this comment

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

I see. In that case, I think we should stick with what we had. I want the people opening PRs to see that instruction and not have it hidden. Let me know if you had something else in mind for this. If not, I'll dismiss this in a few days

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I think you misunderstood again... 😅
Try to use this code in a comment:

<!-- List your features here and the benefits they bring. -->

Before submitting it, click on the Preview button, check the content, and then go back to the Write button.

.github/drafts/PULL_REQUEST_TEMPLATE/new_feature.md Outdated Show resolved Hide resolved
@Thomas-Boi Thomas-Boi requested a review from Panquesito7 July 4, 2021 22:38
@Thomas-Boi
Copy link
Member Author

Here is my test code:
image

This is what it looks like when I preview it in the VS Code:
image

So the <!-- --> doesn't show up like you said.

Now, I'm just a bit confused on how to progress from here. Like the Issue Template, when the user opens a PR, only the text will shows up:

image

However, the version that we see on the website will be the markdown version, so the italics and comments work. Do you mean that you don't want the markdown version to display the instruction? If that's the case, I'm fine with either one. However, we will need to standardize all the Issues and PR templates so the instructions are like that.

@Thomas-Boi
Copy link
Member Author

I just changed all the instructions to comments. I think this will work better

Co-authored-by: David Leal <halfpacho@gmail.com>
Good idea

Co-authored-by: David Leal <halfpacho@gmail.com>
@Thomas-Boi Thomas-Boi requested a review from Panquesito7 July 5, 2021 23:58
Co-authored-by: David Leal <halfpacho@gmail.com>
.github/ISSUE_TEMPLATE/feature_request.md Outdated Show resolved Hide resolved
.github/ISSUE_TEMPLATE/icon-request.md Outdated Show resolved Hide resolved
.github/drafts/PULL_REQUEST_TEMPLATE/new_feature.md Outdated Show resolved Hide resolved
.github/pull_request_template.md Show resolved Hide resolved
.github/pull_request_template.md Outdated Show resolved Hide resolved
.github/pull_request_template.md Outdated Show resolved Hide resolved
Copy link
Member

@Panquesito7 Panquesito7 left a comment

Choose a reason for hiding this comment

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

Looks good. Great work, @Thomas-Boi; thank you! 👍 🎉

@Panquesito7
Copy link
Member

I'll merge this. If there's something wrong or something you missed, you can create another PR to fix it. 🙂

@Panquesito7 Panquesito7 merged commit 3e90d55 into develop Jul 6, 2021
@Thomas-Boi Thomas-Boi deleted the thomas/prTemplateFix branch July 21, 2021 17:58
@amacado amacado mentioned this pull request Aug 14, 2021
GCHQDeveloper926 pushed a commit to GCHQDeveloper926/devicon that referenced this pull request Dec 20, 2024
* Create a general pull_request_template.md

* Apply suggestions from code review

Co-authored-by: David Leal <halfpacho@gmail.com>

* Add line about base of PR in pr template

* Update PR and Issue templates

* Update .github/drafts/PULL_REQUEST_TEMPLATE/new_icon.md

Co-authored-by: David Leal <halfpacho@gmail.com>

* Update .github/drafts/PULL_REQUEST_TEMPLATE/new_icon.md

Good idea

Co-authored-by: David Leal <halfpacho@gmail.com>

* Update .github/drafts/PULL_REQUEST_TEMPLATE/new_icon.md

Co-authored-by: David Leal <halfpacho@gmail.com>

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: David Leal <halfpacho@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants