summaryrefslogtreecommitdiff
path: root/scripts/utils.sh
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-22 12:08:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-22 12:08:59 +0000
commit421f6c92d5984d035a7a6687d70277ba88f5f92b (patch)
tree35286624cfbc591c0f60bf1f0851492cd9d74ae3 /scripts/utils.sh
parent44c4a8ee1e7b995aa2045fd31d637981eb3baccb (diff)
downloadgitlab-ce-421f6c92d5984d035a7a6687d70277ba88f5f92b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/utils.sh')
-rw-r--r--scripts/utils.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/utils.sh b/scripts/utils.sh
index 4f339bbc850..d9205921963 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -38,11 +38,12 @@ function bundle_install_script() {
exit 1;
fi;
- gem install bundler --no-document --conservative --version 2.3.15
+ gem --version
bundle --version
+ gem install bundler --no-document --conservative --version 2.3.15
+ test -d jh && bundle config set --local gemfile 'jh/Gemfile'
bundle config set path "$(pwd)/vendor"
bundle config set clean 'true'
- test -d jh && bundle config set --local gemfile 'jh/Gemfile'
echo "${BUNDLE_WITHOUT}"
bundle config