Merge branch 'develop' into 'master'

Release 1.21.2

See merge request baserow/baserow!1810

Author: bram2w

README.md

@@ -17,7 +17,7 @@ tool gives you the powers of a developer without leaving your browser.
 [![Deploy to Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/bram2w/baserow/tree/master)
 
 ```bash
-docker run -v baserow_data:/baserow/data -p 80:80 -p 443:443 baserow/baserow:1.21.1
+docker run -v baserow_data:/baserow/data -p 80:80 -p 443:443 baserow/baserow:1.21.2
 ```
 
 ![Baserow screenshot](docs/assets/screenshot.png "Baserow screenshot")
@@ -89,7 +89,7 @@ Created by Baserow B.V. - [email protected].
 
 Distributes under the MIT license. See `LICENSE` for more information.
 
-Version: 1.21.1
+Version: 1.21.2
 
 The official repository can be found at https://gitlab.com/baserow/baserow.
 

backend/docker/docker-entrypoint.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 # ENVIRONMENT VARIABLES USED DIRECTLY BY THIS ENTRYPOINT
 # ======================================================
 
-export BASEROW_VERSION="1.21.1"
+export BASEROW_VERSION="1.21.2"
 
 # Used by docker-entrypoint.sh to start the dev server
 # If not configured you'll receive this: CommandError: "0.0.0.0:" is not a valid port number or address:port pair.

backend/setup.py

@@ -5,7 +5,7 @@
 
 PROJECT_DIR = os.path.dirname(__file__)
 REQUIREMENTS_DIR = os.path.join(PROJECT_DIR, "requirements")
-VERSION = "1.21.1"
+VERSION = "1.21.2"
 
 
 def get_requirements(env):

backend/src/baserow/config/settings/base.py

@@ -479,7 +479,7 @@ def install_cachalot():
         "name": "MIT",
         "url": "https://gitlab.com/baserow/baserow/-/blob/master/LICENSE",
     },
-    "VERSION": "1.21.1",
+    "VERSION": "1.21.2",
     "SERVE_INCLUDE_SCHEMA": False,
     "TAGS": [
         {"name": "Settings"},

backend/src/baserow/version.py

@@ -1 +1 @@
-VERSION = "1.21.1"
+VERSION = "1.21.2"

changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Released 1.21.2
+
+### Bug fixes
+* Fixed redirect problem in the additional importer.
+
+
 ## Released 1.21.1
 
 ### Bug fixes

changelog/entries/1.21.2/bug/fix_redirect_problem_of_the_additional_importer.json

@@ -0,0 +1,7 @@
+{
+  "type": "bug",
+  "message": "Fixed redirect problem in the additional importer.",
+  "issue_number": null,
+  "bullet_points": [],
+  "created_at": "2023-10-26"
+}

changelog/releases.json

@@ -1,5 +1,9 @@
 {
     "releases": [
+        {
+            "name": "1.21.2",
+            "created_at": "2023-10-26"
+        },
         {
             "name": "1.21.1",
             "created_at": "2023-10-25"

deploy/all-in-one/README.md

@@ -15,7 +15,7 @@ tool gives you the powers of a developer without leaving your browser.
   [Vue.js](https://vuejs.org/) and [PostgreSQL](https://www.postgresql.org/).
 
 ```bash
-docker run -v baserow_data:/baserow/data -p 80:80 -p 443:443 baserow/baserow:1.21.1
+docker run -v baserow_data:/baserow/data -p 80:80 -p 443:443 baserow/baserow:1.21.2
 ```
 
 ## Quick Reference
@@ -50,7 +50,7 @@ docker run \
   -p 80:80 \
   -p 443:443 \
   --restart unless-stopped \
-  baserow/baserow:1.21.1
+  baserow/baserow:1.21.2
 ```
 
 * Change `BASEROW_PUBLIC_URL` to `https://YOUR_DOMAIN` or `http://YOUR_IP` to enable
@@ -72,7 +72,7 @@ docker run \
 
 ## Image Feature Overview
 
-The `baserow/baserow:1.21.1` image by default runs all of Baserow's various services in a
+The `baserow/baserow:1.21.2` image by default runs all of Baserow's various services in a
 single container for ease of use. A quick summary of its features are:
 
 * Runs a Postgres database and Redis server by default internally and stores all data in
@@ -115,7 +115,7 @@ docker run \
   -p 80:80 \
   -p 443:443 \
   --restart unless-stopped \
-  baserow/baserow:1.21.1
+  baserow/baserow:1.21.2
 ```
 
 ### Behind a reverse proxy already handling ssl
@@ -128,7 +128,7 @@ docker run \
   -v baserow_data:/baserow/data \
   -p 80:80 \
   --restart unless-stopped \
-  baserow/baserow:1.21.1
+  baserow/baserow:1.21.2
 ```
 
 ### On a nonstandard HTTP port
@@ -141,7 +141,7 @@ docker run \
   -v baserow_data:/baserow/data \
   -p 3001:80 \
   --restart unless-stopped \
-  baserow/baserow:1.21.1
+  baserow/baserow:1.21.2
 ```
 
 ### With an external PostgresSQL server
@@ -160,7 +160,7 @@ docker run \
   -p 80:80 \
   -p 443:443 \
   --restart unless-stopped \
-  baserow/baserow:1.21.1
+  baserow/baserow:1.21.2
 ```
 
 ### With an external Redis server
@@ -179,7 +179,7 @@ docker run \
   -p 80:80 \
   -p 443:443 \
   --restart unless-stopped \
-  baserow/baserow:1.21.1
+  baserow/baserow:1.21.2
 ```
 
 ### With an external email server
@@ -199,7 +199,7 @@ docker run \
   -p 80:80 \
   -p 443:443 \
   --restart unless-stopped \
-  baserow/baserow:1.21.1
+  baserow/baserow:1.21.2
 ```
 
 ### Start just the embedded database
@@ -212,7 +212,7 @@ docker run -it \
   --name baserow \
   -p 5432:5432 \
   -v baserow_data:/baserow/data \
-  baserow/baserow:1.21.1 \
+  baserow/baserow:1.21.2 \
   start-only-db 
 # Now get the password from
 docker exec -it baserow cat /baserow/data/.pgpass
@@ -230,7 +230,7 @@ docker run -it \
   --rm \
   --name baserow \
   -v baserow_data:/baserow/data \
-  baserow/baserow:1.21.1 \
+  baserow/baserow:1.21.2 \
   backend-cmd-with-db manage dbshell
 ```
 
@@ -287,16 +287,16 @@ the command below.
 
 ```bash 
 # First read the help message for this command
-docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.21.1 \
+docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.21.2 \
    backend-cmd-with-db backup
 
 # By default backs up to the backups folder in the baserow_data volume.
-docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.21.1 \
+docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.21.2 \
    backend-cmd-with-db backup -f /baserow/data/backups/backup.tar.gz
 
 # Or backup to a file on your host instead run something like:
 docker run -it --rm -v baserow_data:/baserow/data -v $PWD:/baserow/host \
-   baserow/baserow:1.21.1 backend-cmd-with-db backup -f /baserow/host/backup.tar.gz
+   baserow/baserow:1.21.2 backend-cmd-with-db backup -f /baserow/host/backup.tar.gz
 ```
 
 ### Restore only Baserow's Postgres Database
@@ -365,7 +365,7 @@ docker run \
   -p 80:80 \
   -p 443:443 \
   --restart unless-stopped \
-  baserow/baserow:1.21.1
+  baserow/baserow:1.21.2
 ```
 
 Or you can just store it directly in the volume at `baserow_data/env` meaning it will
@@ -374,7 +374,7 @@ be loaded whenever you mount in this data volume.
 ### Building your own image from Baserow
 
 ```dockerfile
-FROM baserow/baserow:1.21.1
+FROM baserow/baserow:1.21.2
 
 # Any .sh files found in /baserow/supervisor/env/ will be sourced and loaded at startup
 # useful for storing your own environment variable overrides.

deploy/all-in-one/supervisor/start.sh

@@ -14,7 +14,7 @@ cat << EOF
 ██████╔╝██║  ██║███████║███████╗██║  ██║╚██████╔╝╚███╔███╔╝
 ╚═════╝ ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝  ╚═╝ ╚═════╝  ╚══╝╚══╝
 
-Version 1.21.1
+Version 1.21.2
 
 =========================================================================================
 EOF