Skip to content

Commit d16119b

Browse files
committed
Remove ajv as an explicit dependency
There was an issue that `ajv` is not installed by mistake. This issue have been fixed on upstream, a few years ago. Now, we can revert the change. This commit partially reverts 985d57a See sameersbn/gitlab#1358 It seems that fix MR on upstream is https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14543 but we cannot check diff because source / target branch removed by mistake Anyway, no need to add ajv as an explicit dependency with (at least) gitlab v11 or later
1 parent 8daea8c commit d16119b

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

assets/build/install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml
203203

204204
# Installs nodejs packages required to compile webpack
205205
exec_as_git yarn install --production --pure-lockfile
206-
exec_as_git yarn add ajv@^4.0.0
207206

208207
echo "Compiling assets. Please be patient, this could take a while..."
209208
exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=4096"

assets/runtime/functions

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2168,7 +2168,6 @@ migrate_database() {
21682168
echo "Prepare recomplie assets... Installing missing node_modules for assets"
21692169
chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
21702170
exec_as_git yarn install --production --pure-lockfile
2171-
exec_as_git yarn add ajv@^4.0.0
21722171
echo "Recompiling assets (relative_url in use), this could take a while..."
21732172
exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1
21742173
fi

0 commit comments

Comments
 (0)