Skip to content

Commit

Permalink
Merge branch 'master' into issue-2712-bis
Browse files Browse the repository at this point in the history
  • Loading branch information
hwillson authored Jul 30, 2018
2 parents adc22f9 + f13598a commit 229c1d3
Show file tree
Hide file tree
Showing 52 changed files with 1,017 additions and 330 deletions.
16 changes: 0 additions & 16 deletions .github/ISSUE_REPLY_TEMPLATE.md

This file was deleted.

20 changes: 6 additions & 14 deletions .github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
---
name: 🐛 Reporting a Bug
about: Open a new issue here if something isn't working as expected.
---

<!--
Thanks for filing an issue on Apollo Client!
Please make sure that you include the following information to ensure that your issue is actionable.
If you don't follow the template, your issue may end up being closed without anyone looking at it carefully, because it is not actionable for us without the information in this template.
If you're filing a feature request, you do not need to follow the template, but please mark the feature box at the bottom and include a specific example in which that feature would be useful.
**PLEASE NOTE:** Feature requests and non-bug related discussions are no longer managed in this repo. Feature requests should be opened in https://github.com/apollographql/apollo-feature-requests.
-->

**Intended outcome:**
Expand All @@ -31,16 +36,3 @@ Run the following command in your project directory, and paste its (automaticall
`npx envinfo@latest --preset apollo --clipboard`
-->

<!--**Issue Labels**
While not necessary, you can help organize our issues by labeling this issue when you open it. To add a label automatically, simply [x] mark the appropriate box below:
- [ ] has-reproduction
- [ ] feature
- [ ] docs
- [ ] blocking
- [ ] good first issue
To add a label not listed above, simply place `/label another-label-name` on a line by itself.
-->
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
name: 🚀 Feature Request
about: Feature requests are managed in the Apollo Feature Request repo (https://github.com/apollographql/apollo-feature-request).
---

Thanks for your interest in helping make Apollo Client better!

Feature requests and non-bug related discussions are no longer managed in this repo. Feature requests should be opened in https://github.com/apollographql/apollo-feature-requests.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/question-discussion.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: 🤗 Question / Discussion
about: Questions / discussions are best posted in Apollo's Slack group or StackOverflow.
---

Need help or want to talk all things Apollo Client? Issues here are reserved for bugs, but one of the following resources should help:

* Apollo's Slack: https://www.apollographql.com/slack
* StackOverflow (`apollo-client` tag): https://stackoverflow.com/questions/tagged/apollo-client
* Apollo Feature Request repo: https://github.com/apollographql/apollo-feature-requests
12 changes: 0 additions & 12 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,3 @@

- [ ] If this PR is a new feature, please reference an issue where a consensus about the design was reached (not necessary for small changes)
- [ ] Make sure all of the significant new logic is covered by tests
- [ ] If this was a change that affects the external API used in GitHunt-React, update GitHunt-React and post a link to the PR in the discussion.

<!--**Pull Request Labels**
While not necessary, you can help organize our pull requests by labeling this issue when you open it. To add a label automatically, simply [x] mark the appropriate box below:
- [ ] feature
- [ ] blocking
- [ ] docs
To add a label not listed above, simply place `/label another-label-name` on a line by itself.
-->
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.json
*.snap
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Place your settings in this file to overwrite default and user settings.
{
"editor.tabSize": 2,
"editor.rulers": [140],
"editor.rulers": [80],
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
"files.exclude": {
Expand Down
Loading

0 comments on commit 229c1d3

Please sign in to comment.