Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2021-04-15 16:19:51 +0300
committerGrzegorz Bizon <grzegorz@gitlab.com>2021-04-15 16:19:51 +0300
commit2d16a14c3b1096fbaf0b4c36ea66b8b8b97ade63 (patch)
tree0d014bae820aeca5d5c3d321d7d0ebdd5b43d0fe
parent0e426c98ab57cf08c934c8d9ef3119f0fe6d292a (diff)
parentb4bb4f018b6ee736ee4f345ac6555ef6e3640756 (diff)
Merge branch '563-release-1-38-0' into 'master'v1.38.0
Release 1.38.0 Closes #563 See merge request gitlab-org/gitlab-pages!460
-rw-r--r--CHANGELOG.md10
-rw-r--r--VERSION2
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d58c451..493e5471 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.38.0 (2021-04-15)
+
+### Added (1 change)
+
+- [Log connection attempt errors](gitlab-org/gitlab-pages@7298e8fd04d58844d2c0fd11051318b392c02ecd) ([merge request](gitlab-org/gitlab-pages!456))
+
+### Fixed (1 change)
+
+- [Allow serving zip from disk in chroot](gitlab-org/gitlab-pages@34e1518038a8164c090ccfbfc30ebc7850e62cf0) ([merge request](gitlab-org/gitlab-pages!457))
+
## 1.37.0 (2021-03-31)
### Added (1 change)
diff --git a/VERSION b/VERSION
index bf50e910..ebeef2f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.37.0
+1.38.0