Skip to content

Commit

Permalink
chore: resolve merge conflicts in snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
tyreer authored and Robert Tyree committed Aug 19, 2020
2 parents 3e53cd6 + b61bcd7 commit e2daec8
Show file tree
Hide file tree
Showing 124 changed files with 1,739 additions and 330 deletions.
71 changes: 71 additions & 0 deletions src/components/__tests__/__snapshots__/Header.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

exports[`Header renders correctly 1`] = `
Array [
<<<<<<< HEAD
.emotion-65 {
=======
.emotion-33 {
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
background-color: var(--color-neutrals-100);
overflow: hidden;
position: -webkit-sticky;
Expand Down Expand Up @@ -1125,6 +1129,7 @@ Array [
align-items: center;
}
<<<<<<< HEAD
.emotion-26 .sui-result__title {
font-size: inherit;
font-weight: 400;
Expand Down Expand Up @@ -1444,6 +1449,24 @@ Array [
background-color: var(--tertiary-background-color);
border: 1px solid #a6a6a6;
border-radius: 4px;
=======
.dark-mode .emotion-33 {
background-color: var(--color-dark-100);
}
.emotion-33 a {
border-bottom: none;
}
@media screen and (max-width:480px) {
.emotion-33 {
display: none;
}
}
.emotion-32 {
height: 30px;
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -1627,7 +1650,11 @@ Array [
color: var(--color-dark-700);
}
<<<<<<< HEAD
.emotion-63 {
=======
.emotion-31 {
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
margin: 0;
padding: 0;
display: -webkit-box;
Expand All @@ -1641,17 +1668,25 @@ Array [
align-items: center;
}
<<<<<<< HEAD
.emotion-63 > li {
=======
.emotion-31 > li {
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
-webkit-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
margin-left: 1rem;
color: var(--secondary-text-color);
}
<<<<<<< HEAD
.emotion-58 {
color: var(--secondary-text-color);
-webkit-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
=======
.emotion-29 {
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand All @@ -1662,11 +1697,15 @@ Array [
align-items: center;
}
<<<<<<< HEAD
.emotion-58:hover {
color: var(--secondary-text-hover-color);
}
.emotion-57 {
=======
.emotion-28 {
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
fill: none;
stroke: currentColor;
stroke-width: 2;
Expand All @@ -1678,7 +1717,11 @@ Array [
cursor: pointer;
}
<<<<<<< HEAD
.emotion-59 {
=======
.emotion-30 {
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
fill: none;
stroke: currentColor;
stroke-width: 2;
Expand All @@ -1694,7 +1737,11 @@ Array [
transition: all 0.2s ease-out;
}
<<<<<<< HEAD
.emotion-59:hover {
=======
.emotion-30:hover {
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
color: var(--secondary-text-hover-color);
}
Expand Down Expand Up @@ -1750,11 +1797,19 @@ Array [
}
<div
<<<<<<< HEAD
className=" emotion-65"
data-swiftype-index={false}
>
<div
className="emotion-64"
=======
className=" emotion-33"
data-swiftype-index={false}
>
<div
className="emotion-32"
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
>
<div
className="emotion-28"
Expand Down Expand Up @@ -1961,6 +2016,7 @@ Array [
</ul>
</nav>
<ul
<<<<<<< HEAD
className="emotion-63"
>
<li>
Expand All @@ -1970,6 +2026,17 @@ Array [
>
<svg
className="emotion-57"
=======
className="emotion-31"
>
<li>
<a
className="emotion-29"
href="?q="
>
<svg
className="emotion-28"
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
Expand All @@ -1989,7 +2056,11 @@ Array [
</li>
<li>
<svg
<<<<<<< HEAD
className="emotion-59"
=======
className="emotion-30"
>>>>>>> b61bcd7f034ce46a961d06edd8828a5c1905eab7
onClick={[Function]}
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
Expand Down
16 changes: 16 additions & 0 deletions src/data/project-main-content/newrelic-nr1-vscode-extension.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
path: "/projects/newrelic/nr1-vscode-extension"
date: "2020-08-17"
title: "NR1 VSCode Extension"
---

## Getting Started

1. Fork this repository.
2. Open project in VS Code.
3. Hit `F5` to compile and launch the extension in debug mode. This will open a new VS Code window in which you can open the Command Palette and try out the commands.
4. Make your changes in a new branch.
5. Commit and push your changes.
6. Open a pull request with a description of the changes. Feel free to include anything that could make our review easier (screenshots, demo gifs, etc.).

Find the detailed instructions for getting started in the project [README](https://github.com/newrelic/nr1-vscode-extension).
10 changes: 10 additions & 0 deletions src/data/project-main-content/newrelic-repolinter-action.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
path: "/projects/newrelic/repolinter-action"
date: "08/14/2020"
title: "New Relic Repolinter Action"
projectConfig: "src/data/projects/newrelic-repolinter-action.json"
---

## Getting Started

Go to the project's [README](https://github.com/newrelic/repolinter-action) for setup and usage details.
29 changes: 18 additions & 11 deletions src/data/project-stats/newrelic-.github.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,42 @@
},
"releases": 0,
"latestRelease": null,
"commits": 5,
"lastSixMonthsCommitTotal": 5,
"contributors": 3,
"commits": 12,
"lastSixMonthsCommitTotal": 12,
"contributors": 4,
"pullRequests": {
"open": 1
"open": 0
},
"searchCategory": "good first issue",
"cachedIssues": [],
"cachedContributors": [
{
"id": 929261,
"login": "tangollama",
"avatarUrl": "https://avatars0.githubusercontent.com/u/929261?v=4",
"htmlUrl": "https://github.com/tangollama",
"contributions": 1
},
{
"id": 1428400,
"login": "coreyarnold",
"avatarUrl": "https://avatars1.githubusercontent.com/u/1428400?v=4",
"htmlUrl": "https://github.com/coreyarnold",
"contributions": 1
},
{
"id": 929261,
"login": "tangollama",
"avatarUrl": "https://avatars0.githubusercontent.com/u/929261?v=4",
"htmlUrl": "https://github.com/tangollama",
"contributions": 2
},
{
"id": 43244625,
"login": "melissaklein24",
"avatarUrl": "https://avatars0.githubusercontent.com/u/43244625?v=4",
"htmlUrl": "https://github.com/melissaklein24",
"contributions": 2
},
{
"id": 8731013,
"login": "prototypicalpro",
"avatarUrl": "https://avatars1.githubusercontent.com/u/8731013?v=4",
"htmlUrl": "https://github.com/prototypicalpro",
"contributions": 3
}
],
"languages": [],
Expand Down
2 changes: 1 addition & 1 deletion src/data/project-stats/newrelic-aws-log-ingestion.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"date": "2020-07-08T20:22:26Z"
},
"commits": 37,
"lastSixMonthsCommitTotal": 21,
"lastSixMonthsCommitTotal": 20,
"contributors": 10,
"pullRequests": {
"open": 1
Expand Down
63 changes: 63 additions & 0 deletions src/data/project-stats/newrelic-demo-deployer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"projectFullName": "newrelic/demo-deployer",
"issues": {
"open": 0
},
"releases": 0,
"latestRelease": null,
"commits": 8,
"lastSixMonthsCommitTotal": 8,
"contributors": 2,
"pullRequests": {
"open": 0
},
"searchCategory": "good first issue",
"cachedIssues": [],
"cachedContributors": [
{
"id": 929261,
"login": "tangollama",
"avatarUrl": "https://avatars0.githubusercontent.com/u/929261?v=4",
"htmlUrl": "https://github.com/tangollama",
"contributions": 1
},
{
"id": 8731013,
"login": "prototypicalpro",
"avatarUrl": "https://avatars1.githubusercontent.com/u/8731013?v=4",
"htmlUrl": "https://github.com/prototypicalpro",
"contributions": 7
}
],
"languages": [
{
"id": "MDg6TGFuZ3VhZ2U1MzU=",
"name": "Dockerfile",
"color": "#384d54"
},
{
"id": "MDg6TGFuZ3VhZ2UxNDE=",
"name": "Ruby",
"color": "#701516"
},
{
"id": "MDg6TGFuZ3VhZ2U0MTc=",
"name": "HTML",
"color": "#e34c26"
},
{
"id": "MDg6TGFuZ3VhZ2UxNDU=",
"name": "Python",
"color": "#3572A5"
}
],
"screenshots": [],
"license": {
"id": "MDc6TGljZW5zZTI=",
"name": "Apache License 2.0",
"spdxId": "Apache-2.0",
"url": "http://choosealicense.com/licenses/apache-2.0/",
"featured": true,
"key": "apache-2.0"
}
}
42 changes: 42 additions & 0 deletions src/data/project-stats/newrelic-demo-instrumentation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"projectFullName": "newrelic/demo-instrumentation",
"issues": {
"open": 0
},
"releases": 0,
"latestRelease": null,
"commits": 4,
"lastSixMonthsCommitTotal": 4,
"contributors": 2,
"pullRequests": {
"open": 1
},
"searchCategory": "good first issue",
"cachedIssues": [],
"cachedContributors": [
{
"id": 929261,
"login": "tangollama",
"avatarUrl": "https://avatars0.githubusercontent.com/u/929261?v=4",
"htmlUrl": "https://github.com/tangollama",
"contributions": 1
},
{
"id": 8731013,
"login": "prototypicalpro",
"avatarUrl": "https://avatars1.githubusercontent.com/u/8731013?v=4",
"htmlUrl": "https://github.com/prototypicalpro",
"contributions": 3
}
],
"languages": [],
"screenshots": [],
"license": {
"id": "MDc6TGljZW5zZTI=",
"name": "Apache License 2.0",
"spdxId": "Apache-2.0",
"url": "http://choosealicense.com/licenses/apache-2.0/",
"featured": true,
"key": "apache-2.0"
}
}
Loading

0 comments on commit e2daec8

Please sign in to comment.