Merge branch 'hotfix/3.8.29' into develop

.github/workflows/beta.yml

@@ -31,6 +31,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Copy robots.txt
+      run: cp public/robots.txt.development public/robots.txt
+
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@master
       with:

.github/workflows/dev.yml

@@ -35,6 +35,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Copy robots.txt
+      run: cp public/robots.txt.development public/robots.txt
+
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@master
       with:

.github/workflows/prod.yml

@@ -35,6 +35,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Copy robots.txt
+      run: cp public/robots.txt.production public/robots.txt
+
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@master
       with:

.gitignore

@@ -32,6 +32,9 @@ dump.rdb
 # Ignore compiled assets
 /public/assets
 
+# Ignore robots.txt - generated before image creation
+/public/robots.txt
+
 # Ignore user uploads
 /public/uploads/*
 !/public/uploads/.keep

public/robots.txt.development

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /