Skip to content

Commit c819d45

Browse files
sandramscsandramsc
authored
Merge branch 'layer5io:master' into contributing/sandramsc/4932
2 parents 1e0f7b1 + 7b1028d commit c819d45

File tree

273 files changed

+3826
-888
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+3826
-888
lines changed

‎gatsby-node.js

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
5656
createRedirect({ fromPath: "/smi", toPath: "/projects/service-mesh-interface-conformance", redirectInBrowser: true, isPermanent: true });
5757
createRedirect({ fromPath: "/projects/getnighthawk", toPath: "/projects/nighthawk", redirectInBrowser: true, isPermanent: true });
5858
createRedirect({ fromPath: "/projects/getnighthawk", toPath: "/projects/nighthawk", redirectInBrowser: true, isPermanent: true });
59+
createRedirect({ fromPath: "/projects/service-mesh-performance", toPath: "/projects/cloud-native-performance", redirectInBrowser: true, isPermanent: true });
5960

6061
//****
6162
// External Resoruce Redirects
@@ -428,6 +429,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
428429
component: integrationTemplate,
429430
context: {
430431
slug: integration.fields.slug,
432+
name: "_images/" + integration.fields.slug.split("/")[2],
431433
},
432434
});
433435
});

‎package-lock.json

+59-49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"dependencies": {
2828
"@fullcalendar/daygrid": "^5.11.3",
29-
"@fullcalendar/google-calendar": "^6.0.2",
29+
"@fullcalendar/google-calendar": "^6.1.9",
3030
"@fullcalendar/interaction": "^6.0.1",
3131
"@fullcalendar/react": "^5.11.2",
3232
"@loadable/component": "^5.15.3",
@@ -43,11 +43,11 @@
4343
"cytoscape-fcose": "^2.2.0",
4444
"dedent": "^0.7.0",
4545
"deepmerge": "^4.3.0",
46-
"formik": "^2.2.9",
46+
"formik": "^2.4.5",
4747
"gatsby": "^4.20.0",
4848
"gatsby-awesome-pagination": "^0.3.8",
4949
"gatsby-background-image": "^1.6.0",
50-
"gatsby-cli": "^5.5.0",
50+
"gatsby-cli": "^5.12.4",
5151
"gatsby-plugin-anchor-links": "^1.2.1",
5252
"gatsby-plugin-feed": "^4.25.0",
5353
"gatsby-plugin-image": "^2.22.0",
@@ -65,7 +65,7 @@
6565
"gatsby-source-filesystem": "^4.25.0",
6666
"gatsby-transformer-sharp": "^4.25.0",
6767
"gbimage-bridge": "^0.2.2",
68-
"gsap": "^3.12.2",
68+
"gsap": "^3.12.3",
6969
"joi": "^17.10.2",
7070
"js-search": "^2.0.0",
7171
"lodash": "^4.17.21",
@@ -103,7 +103,7 @@
103103
"devDependencies": {
104104
"@babel/cli": "^7.18.10",
105105
"@babel/core": "^7.22.9",
106-
"@babel/eslint-parser": "^7.22.9",
106+
"@babel/eslint-parser": "^7.22.15",
107107
"babel-plugin-module-resolver": "^5.0.0",
108108
"cpx": "^1.5.0",
109109
"cross-env": "^7.0.0",

‎src/assets/data/faq/index.js

+7
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,13 @@ const data = {
471471
"Many interns become open source maintainers, and have ongoing responsibility to steward Layer5 and CNCF projects.",
472472
],
473473
},
474+
{
475+
question: "Are internships offered based on previous experiences or projects?",
476+
category: "internships",
477+
answer: [
478+
"Internships are offered based on our commitment to supporting individuals who make a meaningful impact in the community and on our projects. While experience in other projects is wonderful and can be helpful as individuals strive to contribute meaningfully here, it is not a determining factor in whether or not an internship is appropriate to award. The metric we use is whether the individual demonstrates a sustained and positive impact on the projects we steward. We extend support to anyone who achieves this, often in the form of an internship if it proves beneficial to the individual.",
479+
],
480+
},
474481

475482
//
476483
// OTHER

‎src/collections/blog/2023/09-28-hacktoberfest-2023/hacktoberfest-2023-post.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ While a flurry of pull requests may be impressive, maintainers value contributio
4949
That CONTRIBUTING.md file? It's not there for decoration. Treat it as your playbook, providing guidance for equitable collaboration. Ignoring these guidelines is akin to rearranging someone's furniture without permission. Established protocols are crucial, especially in projects with numerous contributors. They help navigate the intricacies of collaborative development. As an example, there is a full set of contributig docs written for Meshery - one for each component:
5050

5151
<ul>
52-
<li><a href="/project/contributing/contributing-gitflow">Contributing to Meshery using git</a></li>
53-
<li><a href="/project/contributing/meshery-windows">Setting up Meshery Development Environment on Windows</a></li>
54-
<li><a href="/project/contributing/build-and-release">Contributing to Meshery Build and Release (CI)</a></li>
55-
<ul><li><a href="/project/contributing/contributing-cypress">Contributing to Meshery's End-to-End Tests using Cypress</a></li></ul>
56-
<li><a href="/project/contributing/contributing-adapters">Contributing to Meshery Adapters</a></li>
57-
<li><a href="/project/contributing/contributing-docker-extension">Contributing to Meshery Docker Extension</a></li>
58-
<li><a href="/project/contributing/contributing-server">Contributing to Meshery Server</a></li>
52+
<li><a href="https://docs.meshery.io/project/contributing/contributing-gitflow">Contributing to Meshery using git</a></li>
53+
<li><a href="https://docs.meshery.io/project/contributing/meshery-windows">Setting up Meshery Development Environment on Windows</a></li>
54+
<li><a href="https://docs.meshery.io/project/contributing/build-and-release">Contributing to Meshery Build and Release (CI)</a></li>
55+
<ul><li><a href="https://docs.meshery.io/project/contributing/contributing-cypress">Contributing to Meshery's End-to-End Tests using Cypress</a></li></ul>
56+
<li><a href="https://docs.meshery.io/project/contributing/contributing-adapters">Contributing to Meshery Adapters</a></li>
57+
<li><a href="https://docs.meshery.io/project/contributing/contributing-docker-extension">Contributing to Meshery Docker Extension</a></li>
58+
<li><a href="https://docs.meshery.io/project/contributing/contributing-server">Contributing to Meshery Server</a></li>
5959
<ul>
60-
<li><a href="/project/contributing/contributing-models">Contributing to Meshery Models</a></li>
61-
<li><a href="/project/contributing/contributing-error">How to write MeshKit compatible errors</a></li>
60+
<li><a href="https://docs.meshery.io/project/contributing/contributing-models">Contributing to Meshery Models</a></li>
61+
<li><a href="https://docs.meshery.io/project/contributing/contributing-error">How to write MeshKit compatible errors</a></li>
6262
</ul>
63-
<li><a href="/project/contributing/contributing-ui">Contributing to Meshery UI</a></li>
64-
<ul><li><a href="/project/contributing/contributing-ui-notification-center">Contributing to Meshery UI - Notification Center</a></li></ul>
65-
<li><a href="/project/contributing/contributing-docs">Contributing to Meshery Docs</a></li>
66-
<li><a href="/project/contributing/contributing-cli">Contributing to Meshery CLI</a></li>
67-
<ul><li><a href="/project/contributing/contributing-cli-guide">Meshery CLI Contributing Guidelines</a></li></ul>
63+
<li><a href="https://docs.meshery.io/project/contributing/contributing-ui">Contributing to Meshery UI</a></li>
64+
<ul><li><a href="https://docs.meshery.io/project/contributing/contributing-ui-notification-center">Contributing to Meshery UI - Notification Center</a></li></ul>
65+
<li><a href="https://docs.meshery.io/project/contributing/contributing-docs">Contributing to Meshery Docs</a></li>
66+
<li><a href="https://docs.meshery.io/project/contributing/contributing-cli">Contributing to Meshery CLI</a></li>
67+
<ul><li><a href="https://docs.meshery.io/project/contributing/contributing-cli-guide">Meshery CLI Contributing Guidelines</a></li></ul>
6868
</ul>
6969

7070
### 4. Upholding a Safe Environment: The Code of Conduct
@@ -87,7 +87,7 @@ Open source is a marathon, not a sprint. Feedback may take time, and collaborati
8787

8888
### 8. Humility and Gratitude: The Essence of Meaningful Contributions
8989

90-
Remember, a meaningful contribution is its own reward. Swag and a profile boost is a delightful bonus, not the end goal. Celebrate your progress, no matter how small, and learn from your experiences. As you recognize that you are part of a much larger movement, we <Link to="blog/community/layer5-recognition-program">recognize our contributors and users milestones</Link> each step of the way. Earn any number of <a href="https://badges.layer5.io">Layer5 badges</a> as you grow with the community.
90+
Remember, a meaningful contribution is its own reward. Swag and a profile boost is a delightful bonus, not the end goal. Celebrate your progress, no matter how small, and learn from your experiences. As you recognize that you are part of a much larger movement, we <Link to="/blog/community/layer5-recognition-program">recognize our contributors and users milestones</Link> each step of the way. Earn any number of <a href="https://badges.layer5.io">Layer5 badges</a> as you grow with the community.
9191

9292
### 9. Earn a Badge
9393

0 commit comments

Comments
 (0)