Merge branch 'master' into buster-fasttrack

This commit is contained in:
Pirate Praveen 2019-11-29 20:56:59 +05:30
commit b9f1850e6c
2 changed files with 2 additions and 2 deletions

2
debian/control vendored
View file

@ -232,7 +232,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-webpack-rails (>= 0.9.10~), ruby-webpack-rails (>= 0.9.10~),
# Many node modules are still in NEW, some are yet to be packaged # Many node modules are still in NEW, some are yet to be packaged
# so we use yarn to downlod those and hence gitlab is in contrib # so we use yarn to downlod those and hence gitlab is in contrib
yarnpkg, yarnpkg (>= 1.19~),
ruby-rack-proxy (>= 0.6~), ruby-rack-proxy (>= 0.6~),
# #
ruby-sassc-rails (>= 2.1~), ruby-sassc-rails (>= 2.1~),

View file

@ -33,7 +33,7 @@ echo "Installing node modules..."
runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.node_modules' runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.node_modules'
runuser -u ${gitlab_user} -- sh -c 'yarnpkg install' runuser -u ${gitlab_user} -- sh -c 'yarnpkg install'
# Remove write permissions of .yarn-metadata.json files # Remove write permissions of .yarn-metadata.json files
runuser -u ${gitlab_user} -- sh -c 'find /var/lib/gitlab/.cache/yarn/v6/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;' runuser -u ${gitlab_user} -- sh -c 'test -d "/var/lib/gitlab/.cache/yarn/v6" && find /var/lib/gitlab/.cache/yarn/v6/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;'
echo "Precompiling locales..." echo "Precompiling locales..."
runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake gettext:po_to_json' runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake gettext:po_to_json'