diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-21 18:07:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-21 18:07:13 +0000 |
| commit | d380b256b976811e54dc4eb7c9ba3ecc5a9ab5be (patch) | |
| tree | 08e2636afd8c045961c04b05361ad4880c767aa2 /scripts/setup | |
| parent | d4aa95428e9ae63a476196bc8c1193d3de253530 (diff) | |
| download | gitlab-ce-d380b256b976811e54dc4eb7c9ba3ecc5a9ab5be.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/setup')
| -rwxr-xr-x | scripts/setup/as-if-jh.sh | 2 | ||||
| -rwxr-xr-x | scripts/setup/find-jh-branch.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/setup/as-if-jh.sh b/scripts/setup/as-if-jh.sh index 38c3ac9b913..70bfdd7b484 100755 --- a/scripts/setup/as-if-jh.sh +++ b/scripts/setup/as-if-jh.sh @@ -19,7 +19,7 @@ download_jh_path() { echoinfo "Downloading ${path}" - curl --location -o "${output}" -H "Private-Token: ${ADD_JH_FILES_TOKEN}" "https://gitlab.com/api/v4/projects/${GITLAB_JH_MIRROR_PROJECT}/repository/archive?sha=${JH_BRANCH}&path=${path}" + curl --location --output "${output}" --header "Private-Token: ${ADD_JH_FILES_TOKEN}" --get --data-urlencode "sha=${JH_BRANCH}" --data-urlencode "path=${path}" "https://gitlab.com/api/v4/projects/${GITLAB_JH_MIRROR_PROJECT}/repository/archive" tar -zxf "${output}" rm "${output}" diff --git a/scripts/setup/find-jh-branch.rb b/scripts/setup/find-jh-branch.rb index 5b36aa7a1f4..67e83423d9c 100755 --- a/scripts/setup/find-jh-branch.rb +++ b/scripts/setup/find-jh-branch.rb @@ -92,7 +92,7 @@ class FindJhBranch def gitlab @gitlab ||= Gitlab.client( endpoint: API::DEFAULT_OPTIONS[:endpoint], - private_token: API::DEFAULT_OPTIONS[:api_token] || '' + private_token: ENV['ADD_JH_FILES_TOKEN'] || '' ) end end |