summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-10-25 09:39:50 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-10-25 09:39:50 +0000
commit5dc6b65f5ec5362ae4aaea7148c9f531303ed8e0 (patch)
tree3a8a8e65dc785ee8381ef0bcb2e3528ea2ac72ad
parent2f470a626238be535c59efa56affb170114651ac (diff)
parent692eb3f84e912bd586f923bd87737bd15ae3b750 (diff)
downloadgitlab-ce-5dc6b65f5ec5362ae4aaea7148c9f531303ed8e0.tar.gz
Merge branch 'dklischies/gitlab-ce-master' into 'master'
Add a note regarding syncing Git submodules in CI Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7047 See merge request !7095
-rw-r--r--doc/user/project/new_ci_build_permissions_model.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/user/project/new_ci_build_permissions_model.md b/doc/user/project/new_ci_build_permissions_model.md
index 8827b501901..60b7bec2ba7 100644
--- a/doc/user/project/new_ci_build_permissions_model.md
+++ b/doc/user/project/new_ci_build_permissions_model.md
@@ -254,6 +254,12 @@ test:
This will make GitLab CI initialize (fetch) and update (checkout) all your
submodules recursively.
+If Git does not use the newly added relative URLs but still uses your old URLs,
+you might need to add `git submodule sync --recursive` to your `.gitlab-ci.yml`,
+prior to running `git submodule update --init --recursive`. This transfers the
+changes from your `.gitmodules` file into the `.git` folder, which is kept by
+runners between runs.
+
In case your environment or your Docker image doesn't have Git installed,
you have to either ask your Administrator or install the missing dependency
yourself: