Resolve merge conflict

config.js

@@ -2,6 +2,8 @@ module.exports = {
   siteTitle: 'Ocean Developer Documentation',
   siteShortTitle: 'Docs',
   siteDescription: 'Tools to Build Data Markets, and Manage ERC20 Data Assets',
+  siteTagline: 'Ocean Protocol V4 public testing kicks off on ',
+  siteTaglineURL: 'https://immunefi.com/bounty/oceanprotocol/',
   siteUrl: process.env.SITE_URL || 'https://docs.oceanprotocol.com',
   siteIcon: 'node_modules/@oceanprotocol/art/logo/favicon-black.png',
   siteCompany: 'Ocean Protocol Foundation Ltd.',

content/tutorials/compute-to-data-minikube.md

@@ -167,6 +167,12 @@ kubectl apply  -f operator-engine/kubernetes/operator.yml
 kubectl create -f operator-service/kubernetes/postgres-configmap.yaml
 ```
 
+**Optional**: For production enviroments, it's safer to block access to metadata. To do so run the below command:
+
+```bash
+kubectl -n ocean-compute apply -f /ocean/operator-engine/kubernetes/egress.yaml
+```
+
 ## Expose Operator Service
 
 ```bash

docs/github.md

@@ -16,7 +16,7 @@ Currently, there are three ways of getting data from GitHub to construct various
 
 The GitHub GraphQL API integration is done through [gatsby-source-graphql](https://www.gatsbyjs.org/packages/gatsby-source-graphql/) and requires authorization.
 
-An environment variable `GITHUB_TOKEN` needs to present, filled with a [personal access token](https://github.com/settings/tokens) with the scope `public_repo`.
+An environment variable `GITHUB_TOKEN` needs to be present, filled with a [personal access token](https://github.com/settings/tokens) with the scope `public_repo`.
 
 For local development, you can simply [create a personal access token](https://github.com/settings/tokens) and use it in your local .env file:
 
@@ -24,6 +24,9 @@ For local development, you can simply [create a personal access token](https://g
 cp .env.sample .env
 vi .env # GITHUB_TOKEN=add_your_token_here
 ```
+An alternative to typing the above code is to just create a .env file and add this line `GITHUB_TOKEN=add_your_token_here` in it. Do not put your token in quotes.
+
+Here's a guide on how to [create a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token).
 
 When running the site locally, you can use the GraphiQL client running under [localhost:8000/\_\_\_graphql](http://localhost:8000/___graphql) to explore the whole GraphQL layer of the site (not just the GitHub infos).
 

src/components/HeaderHome.jsx

@@ -16,15 +16,23 @@ const HeaderHome = () => (
           siteMetadata {
             siteTitle
             siteDescription
+            siteTagline
+            siteTaglineURL
           }
         }
       }
     `}
     render={(data) => {
-      const { siteTitle, siteDescription } = data.site.siteMetadata
+      const { siteTitle, siteDescription, siteTagline, siteTaglineURL } =
+        data.site.siteMetadata
+
       return (
         <header className={styles.header}>
           <Content>
+            <div className={styles.tagline}>
+              {siteTagline}
+              <a href={siteTaglineURL}>Immunefi</a>
+            </div>
             <Logo className={styles.headerLogo} />
             <h1 className={styles.headerTitle}>
               {siteTitle}

src/components/HeaderHome.module.scss

@@ -51,3 +51,10 @@
   margin-top: $spacer * 0.5;
   align-items: 'center';
 }
+
+.tagline {
+  margin-top: $spacer * 0.5;
+  align-items: 'center';
+  font-size: $font-size-h2;
+  margin-bottom: $spacer;
+}