Add workaround for broken libjs-jquery-atwho (#890391)
This commit is contained in:
parent
8bcd27c5aa
commit
286257652b
3 changed files with 7 additions and 1 deletions
2
debian/control
vendored
2
debian/control
vendored
|
@ -16,6 +16,8 @@ Package: gitlab
|
|||
Architecture: all
|
||||
XB-Ruby-Versions: ${ruby:Versions}
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
|
||||
# workaround for broken libjs-jquery-atwho #890391
|
||||
wget,
|
||||
lsb-base (>= 3.0-6),
|
||||
git (>= 1:2.7.3~),
|
||||
rake,
|
||||
|
|
2
debian/gitlab.links
vendored
2
debian/gitlab.links
vendored
|
@ -16,7 +16,7 @@ usr/share/javascript/pdf/build/pdf.worker.js usr/share/gitlab/vendor/assets/java
|
|||
usr/share/javascript/pdf/build/pdf.js usr/share/gitlab/vendor/assets/javascripts/pdf.js
|
||||
usr/share/javascript/pdf/build/pdf.js usr/share/gitlab/vendor/assets/javascripts/pdf.min.js
|
||||
usr/share/javascript/caret.js/jquery.caret.js usr/share/gitlab/vendor/assets/javascripts/jquery.caret.js
|
||||
usr/share/javascript/jquery-atwho/jquery.atwho.js usr/share/gitlab/vendor/assets/javascripts/jquery.atwho.js
|
||||
usr/share/gitlab/node_modules/at.js/dist/js/jquery.atwho.js usr/share/gitlab/vendor/assets/javascripts/jquery.atwho.js
|
||||
usr/share/javascript/jquery-nicescroll/jquery.nicescroll.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.nicescroll.min.js
|
||||
usr/share/javascript/clipboard/clipboard.js usr/share/gitlab/vendor/assets/javascripts/clipboard.js
|
||||
usr/share/javascript/chartjs/Chart.js usr/share/gitlab/vendor/assets/javascripts/chart-lib.min.js
|
||||
|
|
4
debian/rake-tasks.sh
vendored
4
debian/rake-tasks.sh
vendored
|
@ -32,6 +32,10 @@ echo "Installing node modules"
|
|||
runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/node_modules'
|
||||
runuser -u ${gitlab_user} -- sh -c 'npm install npm'
|
||||
runuser -u ${gitlab_user} -- sh -c 'node_modules/.bin/npm install'
|
||||
# workaround for broken libjs-jquery-atwho #890391
|
||||
# npm i at.js won't work as it needs jquery@^1.7.0 as peer dependency
|
||||
runuser -u ${gitlab_user} -- sh -c 'wget -O /tmp/at.js.tar.gz `npm view at.js dist.tarball`'
|
||||
runuser -u ${gitlab_user} -- sh -c 'tar -C node_modules --transform "s/package/at.js/" -zxf /tmp/at.js.tar.gz'
|
||||
runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/webpack'
|
||||
runuser -u ${gitlab_user} -- sh -c 'NODE_PATH=/usr/share/gitlab/node_modules webpack --config config/webpack.config.js'
|
||||
|
||||
|
|
Loading…
Reference in a new issue