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:
authorNick Thomas <nick@gitlab.com>2019-01-11 17:05:20 +0300
committerNick Thomas <nick@gitlab.com>2019-01-11 17:05:20 +0300
commit89519349a4a3efbc7a2512f08a1fa3ce85ed0feb (patch)
treef1df712c69b0f8c4660b9442fe0e13153c369710 /shared
parent5dc404ef5660903a14f98bb46f6628afe3b272af (diff)
parentf7fd1fa5f93c36f2473ee1b53ba4ee2b21eeac12 (diff)
Merge branch 'ac-subgroups' into 'master'
pages for subgroups Closes gitlab-ce#30548 See merge request gitlab-org/gitlab-pages!123
Diffstat (limited to 'shared')
-rw-r--r--shared/pages/group.auth/subgroup/private.project.1/config.json1
-rw-r--r--shared/pages/group.auth/subgroup/private.project.1/public/index.html1
-rw-r--r--shared/pages/group.auth/subgroup/private.project.2/config.json1
-rw-r--r--shared/pages/group.auth/subgroup/private.project.2/public/index.html1
-rw-r--r--shared/pages/group.auth/subgroup/private.project/config.json1
-rw-r--r--shared/pages/group.auth/subgroup/private.project/public/index.html1
-rw-r--r--shared/pages/group/subgroup/project/public/index.html1
-rw-r--r--shared/pages/group/subgroup/project/public/subdir/index.html1
8 files changed, 8 insertions, 0 deletions
diff --git a/shared/pages/group.auth/subgroup/private.project.1/config.json b/shared/pages/group.auth/subgroup/private.project.1/config.json
new file mode 100644
index 00000000..bee56003
--- /dev/null
+++ b/shared/pages/group.auth/subgroup/private.project.1/config.json
@@ -0,0 +1 @@
+{ "domains": [], "id": 2001, "access_control": true }
diff --git a/shared/pages/group.auth/subgroup/private.project.1/public/index.html b/shared/pages/group.auth/subgroup/private.project.1/public/index.html
new file mode 100644
index 00000000..c8c6761a
--- /dev/null
+++ b/shared/pages/group.auth/subgroup/private.project.1/public/index.html
@@ -0,0 +1 @@
+private \ No newline at end of file
diff --git a/shared/pages/group.auth/subgroup/private.project.2/config.json b/shared/pages/group.auth/subgroup/private.project.2/config.json
new file mode 100644
index 00000000..7545aed1
--- /dev/null
+++ b/shared/pages/group.auth/subgroup/private.project.2/config.json
@@ -0,0 +1 @@
+{ "domains": [], "id": 3001, "access_control": true }
diff --git a/shared/pages/group.auth/subgroup/private.project.2/public/index.html b/shared/pages/group.auth/subgroup/private.project.2/public/index.html
new file mode 100644
index 00000000..c8c6761a
--- /dev/null
+++ b/shared/pages/group.auth/subgroup/private.project.2/public/index.html
@@ -0,0 +1 @@
+private \ No newline at end of file
diff --git a/shared/pages/group.auth/subgroup/private.project/config.json b/shared/pages/group.auth/subgroup/private.project/config.json
new file mode 100644
index 00000000..a76960d7
--- /dev/null
+++ b/shared/pages/group.auth/subgroup/private.project/config.json
@@ -0,0 +1 @@
+{ "domains": [], "id": 1001, "access_control": true }
diff --git a/shared/pages/group.auth/subgroup/private.project/public/index.html b/shared/pages/group.auth/subgroup/private.project/public/index.html
new file mode 100644
index 00000000..c8c6761a
--- /dev/null
+++ b/shared/pages/group.auth/subgroup/private.project/public/index.html
@@ -0,0 +1 @@
+private \ No newline at end of file
diff --git a/shared/pages/group/subgroup/project/public/index.html b/shared/pages/group/subgroup/project/public/index.html
new file mode 100644
index 00000000..91ec223d
--- /dev/null
+++ b/shared/pages/group/subgroup/project/public/index.html
@@ -0,0 +1 @@
+A subgroup project
diff --git a/shared/pages/group/subgroup/project/public/subdir/index.html b/shared/pages/group/subgroup/project/public/subdir/index.html
new file mode 100644
index 00000000..59bf0492
--- /dev/null
+++ b/shared/pages/group/subgroup/project/public/subdir/index.html
@@ -0,0 +1 @@
+A subgroup project-subsubdir