diff --git a/debian/control b/debian/control index 924996d819..7427b6a4c8 100644 --- a/debian/control +++ b/debian/control @@ -327,7 +327,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, node-bootstrap, node-cache-loader (>= 2.0.1~), node-chart.js (>= 2.7.2~), - node-core-js (>= 3.1.3~), +# need transition (embedded) +# node-core-js (>= 3.1.3~), node-css-loader, node-d3, node-d3-array, diff --git a/debian/gitlab.install b/debian/gitlab.install index c6e9e82957..73a2aa3a66 100644 --- a/debian/gitlab.install +++ b/debian/gitlab.install @@ -58,3 +58,4 @@ yarn.lock /var/lib/gitlab shared var/lib/gitlab public var/lib/gitlab db var/lib/gitlab +core-js usr/share/gitlab/vendor/node_modules diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index c5410c4b1b..1ada662f1f 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -127,7 +127,7 @@ resolve: { extensions: ['.js', '.gql', '.graphql'], - modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'], -+ modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs', '/usr/share/nodejs'], ++ modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/vendor/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs', '/usr/share/nodejs'], alias, }, diff --git a/debian/upstream-file-list b/debian/upstream-file-list index 78df7590c1..2658ece359 100644 --- a/debian/upstream-file-list +++ b/debian/upstream-file-list @@ -52,6 +52,7 @@ builds changelogs config config.ru +core-js danger db debian