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
path: root/shared
diff options
context:
space:
mode:
authorJaime Martinez <jmartinez@gitlab.com>2020-05-28 11:07:03 +0300
committerJaime Martinez <jmartinez@gitlab.com>2020-07-06 02:13:51 +0300
commit4f82a5659cfcec5e7782b80f0d551353cbdcc1dc (patch)
tree0b9ccdfa09a1cbf932dfd23d26506b3096ccd285 /shared
parentfb2c26ff998b809baddeb9618aae52c49200bc8b (diff)
Get namespace domain if auth fails for a private domain
Add acceptance test and some more domains for testing Move namespace domain serving logic Restore go.sum Remove redundant return Fix linter
Diffstat (limited to 'shared')
-rw-r--r--shared/pages/group.404/private_project/config.json5
-rw-r--r--shared/pages/group.404/private_project/public/404.html1
-rw-r--r--shared/pages/group.404/private_unauthorized/config.json5
-rw-r--r--shared/pages/group.404/private_unauthorized/public/404.html1
4 files changed, 12 insertions, 0 deletions
diff --git a/shared/pages/group.404/private_project/config.json b/shared/pages/group.404/private_project/config.json
new file mode 100644
index 00000000..5c0ebb50
--- /dev/null
+++ b/shared/pages/group.404/private_project/config.json
@@ -0,0 +1,5 @@
+{ "domains": [
+ {
+ "Domain": "group.404.gitlab-example.com"
+ }
+], "id": 1000, "access_control": true }
diff --git a/shared/pages/group.404/private_project/public/404.html b/shared/pages/group.404/private_project/public/404.html
new file mode 100644
index 00000000..6993ae1a
--- /dev/null
+++ b/shared/pages/group.404/private_project/public/404.html
@@ -0,0 +1 @@
+Private custom 404 error page
diff --git a/shared/pages/group.404/private_unauthorized/config.json b/shared/pages/group.404/private_unauthorized/config.json
new file mode 100644
index 00000000..79349565
--- /dev/null
+++ b/shared/pages/group.404/private_unauthorized/config.json
@@ -0,0 +1,5 @@
+{ "domains": [
+ {
+ "Domain": "group.404.gitlab-example.com"
+ }
+], "id": 2000, "access_control": true }
diff --git a/shared/pages/group.404/private_unauthorized/public/404.html b/shared/pages/group.404/private_unauthorized/public/404.html
new file mode 100644
index 00000000..6993ae1a
--- /dev/null
+++ b/shared/pages/group.404/private_unauthorized/public/404.html
@@ -0,0 +1 @@
+Private custom 404 error page