Merge branch 'master' into 5190-improve-websockets-idle-memory-v2-only-kc8

2024-12-14 17:02:49 +03:00 · 2020-06-26 15:02:49 -04:00 · 2020-06-26 15:02:49 -04:00 · 1dbe5cd1ab
commit 1dbe5cd1ab
parent f9b5b8382c 6c689992ae
14 changed files with 13 additions and 162 deletions
--- a/docs/_static/hasura-custom.css
+++ b/docs/_static/hasura-custom.css
@ -214,94 +214,6 @@ p {
 #mce-responses .success-message {
  color: #1cd3c6 !important;
 }
-.bannerStripWrapper {
-  background-color: #3D1BB7;
-  box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.4);
-  position: relative;
-  min-height: 56px;
-  max-height: 56px;
-  display: flex;
-  align-items: center;
-}
-.bannerStripWrapper .bannerInnerWrapper {
-  padding: 0 15px;
-}
-.bannerStripWrapper .displayFlex
-{
-  display: flex;
-  align-items: center;
-  width: 100%;
-}
-.bannerStripWrapper .displayFlex a {
-  flex: 1;
-  text-decoration: none;
-}
-.bannerStripWrapper .bannerStripImg {
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-.bannerStripWrapper .bannerStripImg img {
-  max-height: 56px;
-  opacity: .4;
-}
-.bannerStripWrapper .bannerStrip
-{
-  padding: 8px 0px;
-  display: flex;
-  align-items: center;
-  position: relative;
-  z-index: 10;
-}
-.bannerStripWrapper .bannerStrip .announceIcon {
-  display: inline-flex;
-}
-.bannerStripWrapper .bannerStrip .announceIcon img {
-  margin-top: 4px;
-  margin-right: 16px;
-  width: 32px;
-}
-.bannerStripWrapper .displayFlex a:hover, .bannerStripWrapper .displayFlex a:focus {
-  text-decoration: none;
-}
-.bannerStripWrapper .closeBanner {
-  cursor: pointer;
-  text-align: right;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 11;
-  margin-left: auto;
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-  background-color: rgba(61,27,183,.8);
-}
-.bannerStripWrapper .closeBanner img {
-  margin-right: 0;
-}
-.bannerStripWrapper .bannerStrip .bodyTextSmall
-{
-  font-family: Poppins;
-  text-align: left;
-  padding-top: 0;
-  letter-spacing: normal;
-  font-weight: 600;
-  display: inline-block;
-  line-height: 17px;
-  color: #fff;
-  padding-bottom: 0;
-  padding-right: 10px;
-}
-.bannerStripWrapper .bannerStrip .bodyTextSmall .fontNormal {
-  font-weight: 400;
-}
-.bannerStripWrapper .bannerStrip .bodyTextSmall .mLeft15 {
-  margin-left: 15px;
-}
-.bannerStripWrapper .bannerStrip .bodyTextSmall .underLine {
-  text-decoration: underline;
-}
 .content_inner_wrapper {
  width: 75% !important;
  /* height: 100vh; */
@ -1121,21 +1033,6 @@ article ol ol {
  }
 }
@media (min-width: 768px) and (max-width: 1385px) {
-  .bannerStripWrapper {
-    /* padding-left: 4vw; */
-  }
-  .bannerStripWrapper .bannerStrip .bodyTextSmall {
-    line-height: 21px;
-  }
-  .bannerStripWrapper .bannerStripImg {
-    display: none;
-  }
-  .bannerStripWrapper .bannerStrip .displayFlex {
-    justify-content: flex-start;
-  }
-  .bannerStripWrapper .closeBanner {
-    right: 0;
-  }
  #mc_embed_signup form {
    padding-top: 10px !important;
  }
@ -1152,27 +1049,6 @@ article ol ol {
 }
 /*** Mobile overrides ***/
@media (max-width: 767px) {
-  .bannerStripWrapper {
-      max-height: none;
-      padding: 0 0px;
-    }
-    .bannerStripWrapper .bannerStrip {
-      padding-left: 0px;
-    }
-    .bannerStripWrapper .bannerStrip .bodyTextSmall {
-      padding-left: 8px;
-      line-height: 120%;
-      font-size: 15px;
-    }
-    .bannerStripWrapper .bannerStripImg {
-      display: none;
-    }
-    .bannerStripWrapper .bannerStrip .bodyTextSmall {
-      padding-left: 0;
-    }
-    .bannerStripWrapper .bannerStrip .bodyTextSmall .mLeft15 {
-      margin-left: 5px;
-    }
  #sidebar {
    top: 170px;
    height: calc(100% - 170px);
@ -1626,4 +1502,4 @@ article ol ol {
 .tabbarContainerWrapper .tabbarTabActive span {
  color: rgba(255, 255, 255, 1) !important;
  border-bottom: 2px solid white !important;
-}
+}
--- a/docs/_theme/djangodocs/layout.html
+++ b/docs/_theme/djangodocs/layout.html
@ -29,32 +29,6 @@
  <div id="custom-doc" class="{% block bodyclass %}{{ 'yui-t6' if not is_landing_page else '' }}{% endblock %}">
    <div class="main_container_wrapper">
      {% include 'pages/loading.html' %}
-      <div id="banner" class="bannerStripWrapper hide">
-        <div class='bannerInnerWrapper displayFlex'>
-          <a
-            href="https://hasura.io/events/hasura-con-2020/"
-            target="_blank"
-            rel="noreferrer noopener"
-          >
-            <div class="bannerStrip">
-              <div class="displayFlex noPadd">
-                <div class="announceIcon">
-                  <img src="{{ pathto('_images/layout/hasura-con.svg', 1) }}" alt="Hasura con 2020"/>
-                </div>
-                <div class="bodyTextSmall">
-                  Hasura Con: <span class='fontNormal'>Our free online conference on pushing the boundaries of GraphQL<span class='mLeft15'>·</span></span><span class='underLine mLeft15'>Register now</span>
-                </div>
-              </div>
-            </div>
-          </a>
-          <div id="banner-close" class="closeBanner">
-            <img src="{{ pathto('_images/layout/close.svg', 1) }}" alt="Close" />
-          </div>
-        </div>
-        <div class='bannerStripImg'>
-          <img src="{{ pathto('_images/layout/stripe.png', 1) }}" alt='stripe' />
-        </div>
-      </div>
      <header
        id="header"
        class='blueBgColor boderBottom'
--- a/install-manifests/azure-container-with-pg/azuredeploy.json
+++ b/install-manifests/azure-container-with-pg/azuredeploy.json
@ -97,7 +97,7 @@
    "firewallRuleName": "allow-all-azure-firewall-rule",
    "containerGroupName": "[concat(parameters('name'), '-container-group')]",
    "containerName": "hasura-graphql-engine",
-    "containerImage": "hasura/graphql-engine:v1.3.0-beta.2"
+    "containerImage": "hasura/graphql-engine:v1.3.0-beta.3"
  },
  "resources": [
    {
--- a/install-manifests/azure-container/azuredeploy.json
+++ b/install-manifests/azure-container/azuredeploy.json
@ -55,7 +55,7 @@
    "dbName": "[parameters('postgresDatabaseName')]",
    "containerGroupName": "[concat(parameters('name'), '-container-group')]",
    "containerName": "hasura-graphql-engine",
-    "containerImage": "hasura/graphql-engine:v1.3.0-beta.2"
+    "containerImage": "hasura/graphql-engine:v1.3.0-beta.3"
  },
  "resources": [
    {
--- a/install-manifests/docker-compose-https/docker-compose.yaml
+++ b/install-manifests/docker-compose-https/docker-compose.yaml
@ -8,7 +8,7 @@ services:
    environment:
      POSTGRES_PASSWORD: postgrespassword
  graphql-engine:
-    image: hasura/graphql-engine:v1.3.0-beta.2
+    image: hasura/graphql-engine:v1.3.0-beta.3
    depends_on:
    - "postgres"
    restart: always
--- a/install-manifests/docker-compose-pgadmin/docker-compose.yaml
+++ b/install-manifests/docker-compose-pgadmin/docker-compose.yaml
@ -19,7 +19,7 @@ services:
      PGADMIN_DEFAULT_EMAIL: pgadmin@example.com
      PGADMIN_DEFAULT_PASSWORD: admin
  graphql-engine:
-    image: hasura/graphql-engine:v1.3.0-beta.2
+    image: hasura/graphql-engine:v1.3.0-beta.3
    ports:
    - "8080:8080"
    depends_on:
--- a/install-manifests/docker-compose-postgis/docker-compose.yaml
+++ b/install-manifests/docker-compose-postgis/docker-compose.yaml
@ -8,7 +8,7 @@ services:
    environment:
      POSTGRES_PASSWORD: postgrespassword
  graphql-engine:
-    image: hasura/graphql-engine:v1.3.0-beta.2
+    image: hasura/graphql-engine:v1.3.0-beta.3
    ports:
    - "8080:8080"
    depends_on:
--- a/install-manifests/docker-compose/docker-compose.yaml
+++ b/install-manifests/docker-compose/docker-compose.yaml
@ -8,7 +8,7 @@ services:
    environment:
      POSTGRES_PASSWORD: postgrespassword
  graphql-engine:
-    image: hasura/graphql-engine:v1.3.0-beta.2
+    image: hasura/graphql-engine:v1.3.0-beta.3
    ports:
    - "8080:8080"
    depends_on:
--- a/install-manifests/docker-run/docker-run.sh
+++ b/install-manifests/docker-run/docker-run.sh
@ -3,4 +3,4 @@ docker run -d -p 8080:8080 \
       -e HASURA_GRAPHQL_DATABASE_URL=postgres://username:password@hostname:port/dbname \
       -e HASURA_GRAPHQL_ENABLE_CONSOLE=true \
       -e HASURA_GRAPHQL_DEV_MODE=true \
-       hasura/graphql-engine:v1.3.0-beta.2
+       hasura/graphql-engine:v1.3.0-beta.3
--- a/install-manifests/google-cloud-k8s-sql/deployment.yaml
+++ b/install-manifests/google-cloud-k8s-sql/deployment.yaml
@ -16,7 +16,7 @@ spec:
    spec:
      containers:
        - name: graphql-engine
-          image: hasura/graphql-engine:v1.3.0-beta.2
+          image: hasura/graphql-engine:v1.3.0-beta.3
          ports:
            - containerPort: 8080
          readinessProbe:
--- a/install-manifests/kubernetes/deployment.yaml
+++ b/install-manifests/kubernetes/deployment.yaml
@ -18,7 +18,7 @@ spec:
        app: hasura
    spec:
      containers:
-      - image: hasura/graphql-engine:v1.3.0-beta.2
+      - image: hasura/graphql-engine:v1.3.0-beta.3
        imagePullPolicy: IfNotPresent
        name: hasura
        env:
--- a/scripts/cli-migrations/v1/Dockerfile
+++ b/scripts/cli-migrations/v1/Dockerfile
@ -1,4 +1,4 @@
-FROM hasura/graphql-engine:v1.3.0-beta.2
+FROM hasura/graphql-engine:v1.3.0-beta.3

 # set an env var to let the cli know that
 # it is running in server environment
--- a/scripts/cli-migrations/v2/Dockerfile
+++ b/scripts/cli-migrations/v2/Dockerfile
@ -2,7 +2,7 @@ FROM hasura/haskell-docker-packager:20190731 as packager
 WORKDIR /tmp
 RUN apt-get update && apt-get download libstdc++6

-FROM hasura/graphql-engine:v1.3.0-beta.2
+FROM hasura/graphql-engine:v1.3.0-beta.3

 # install libstdc++6 from .deb file
 COPY --from=packager /tmp/libstdc++6* .
--- a/server/src-rsr/catalog_versions.txt
+++ b/server/src-rsr/catalog_versions.txt
@ -25,3 +25,4 @@ v1.2.1 34
 v1.2.2 34
 v1.3.0-beta.1 36
 v1.3.0-beta.2 36
+v1.3.0-beta.3 36