workaround for pikaday

debian/control

@@ -93,7 +93,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 # API
  ruby-grape (>= 0.19.2~),
  ruby-grape-entity (>= 0.6~),
- ruby-rack-cors (>= 0.4.0~),
+ ruby-rack-cors (>= 1.0~),
 # Disable strong_params so that Mash does not respond to :permitted?
  ruby-hashie-forbidden-attributes,
 # Pagination
@@ -105,7 +105,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 # Drag and Drop UI
  ruby-dropzonejs-rails (>= 0.7.1~),
 # for backups
- ruby-fog-aws (>= 1.4~),
+ ruby-fog-aws (>= 2.0~),
  ruby-fog-core (>= 1.44~),
  ruby-fog-google (>= 0.5~),
  ruby-fog-local (>= 0.3~),
@@ -143,7 +143,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 # Run events after state machine commits
  ruby-after-commit-queue,
 # Issue tags
- ruby-acts-as-taggable-on (>= 4.0~),
+ ruby-acts-as-taggable-on (>= 5.0~),
 # Background jobs
  ruby-sidekiq (>= 5.0~),
  ruby-sidekiq-cron (>= 0.6~),
@@ -296,6 +296,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  libjs-fuzzaldrin-plus (>= 0.3.1+git.20161008.da2cb58+dfsg-4~),
  node-lie,
  phantomjs,
+ node-axios,
  node-babel-core,
  node-babel-eslint,
  node-babel-loader,
@@ -303,19 +304,35 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  node-babel-preset-latest,
  node-babel-preset-stage-2,
  node-bootstrap-sass,
+ node-copy-webpack-plugin,
  node-core-js,
+ node-css-loader,
+ node-d3,
+ node-emoji-unicode-version,
  node-eslint-plugin-html,
  node-exports-loader,
  node-file-loader,
  node-imports-loader,
  node-jed,
+ node-jquery,
+ node-jquery-ujs,
+ node-js-cookie,
  node-jszip,
+ node-jszip-utils,
  node-marked,
  node-mousetrap,
+ node-pikaday,
+ node-raven-js,
  node-raw-loader,
  node-stats-webpack-plugin,
+ node-three,
+ node-three-orbit-controls,
+ node-three-stl-loader,
  node-underscore,
  node-url-loader,
+ node-vue-resource,
+ node-vue-template-compiler,
+ node-webpack-stats-plugin,
  node-katex
 Recommends: certbot
 Description: git powered software platform to collaborate on code (non-omnibus)

debian/gitlab.links

@@ -24,4 +24,5 @@ usr/share/javascript/graphael/g.raphael-min.js usr/share/gitlab/vendor/assets/ja
 usr/share/javascript/graphael/g.bar-min.js usr/share/gitlab/vendor/assets/javascripts/g.bar-min.js
 usr/share/javascript/fuzzaldrin/fuzzaldrin-plus.js usr/share/gitlab/vendor/assets/javascripts/fuzzaldrin-plus.js
 /var/lib/gitlab/.gitlab_workhorse_secret    /usr/share/gitlab/.gitlab_workhorse_secret
+/var/lib/gitlab/.gitlab_shell_secret    /usr/share/gitlab/.gitlab_shell_secret
 /var/lib/gitlab/Gemfile.lock    /usr/share/gitlab/Gemfile.lock

debian/patches/0310-relax-rack-cors.patch

@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -79,7 +79,7 @@
+ # API
+ gem 'grape', '~> 0.19.2'
+ gem 'grape-entity', '~> 0.6.0'
+-gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
++gem 'rack-cors', '~> 1.0', require: 'rack/cors'
+ 
+ # Disable strong_params so that Mash does not respond to :permitted?
+ gem 'hashie-forbidden_attributes'

debian/patches/0320-relax-fog-aws.patch

@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -97,7 +97,7 @@
+ gem 'dropzonejs-rails', '~> 0.7.1'
+ 
+ # for backups
+-gem 'fog-aws', '~> 1.4'
++gem 'fog-aws', '>= 1.4'
+ gem 'fog-core', '~> 1.44'
+ gem 'fog-google', '~> 0.5'
+ gem 'fog-local', '~> 0.3'

debian/patches/0330-relax-acts-as-taggable-on.patch

@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -146,7 +146,7 @@
+ gem 'after_commit_queue', '~> 1.3'
+ 
+ # Issue tags
+-gem 'acts-as-taggable-on', '~> 4.0'
++gem 'acts-as-taggable-on', '~> 5.0'
+ 
+ # Background jobs
+ gem 'sidekiq', '~> 5.0'

debian/patches/0340-relax-httparty.patch

@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -158,7 +158,7 @@
+ gem 'rufus-scheduler', '~> 3.4'
+ 
+ # HTTP requests
+-gem 'httparty', '~> 0.13.3'
++gem 'httparty', '~> 0.13'
+ 
+ # Colored output to console
+ gem 'rainbow', '~> 2.2'

debian/patches/0350-relax-oj.patch

@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -233,7 +233,7 @@
+ gem 'charlock_holmes', '~> 0.7.3'
+ 
+ # Faster JSON
+-gem 'oj', '~> 2.17', '>= 2.17.4'
++gem 'oj', '>= 2.17.4'
+ 
+ # Parse time & duration
+ gem 'chronic', '~> 0.10.2'

debian/patches/0420-use-system-libs.patch

@@ -1,9 +1,10 @@
 --- a/package.json
 +++ b/package.json
-@@ -13,16 +13,8 @@
+@@ -12,60 +12,22 @@
+     "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
    },
    "dependencies": {
-     "axios": "^0.16.2",
+-    "axios": "^0.16.2",
 -    "babel-core": "^6.22.1",
 -    "babel-eslint": "^7.2.1",
 -    "babel-loader": "^7.1.1",
@@ -12,49 +13,79 @@
 -    "babel-preset-stage-2": "^6.22.0",
 -    "bootstrap-sass": "^3.3.6",
      "compression-webpack-plugin": "^0.3.2",
-     "copy-webpack-plugin": "^4.0.1",
+-    "copy-webpack-plugin": "^4.0.1",
 -    "core-js": "^2.4.1",
      "cropper": "^2.3.0",
-     "css-loader": "^0.28.0",
+-    "css-loader": "^0.28.0",
-     "d3": "^3.5.11",
+-    "d3": "^3.5.11",
-@@ -30,25 +22,16 @@
+     "deckar01-task_list": "^2.0.0",
      "document-register-element": "^1.3.0",
      "dropzone": "^4.2.0",
-     "emoji-unicode-version": "^0.2.1",
+-    "emoji-unicode-version": "^0.2.1",
 -    "eslint-plugin-html": "^2.0.1",
 -    "exports-loader": "^0.6.4",
 -    "file-loader": "^0.11.1",
 -    "imports-loader": "^0.7.1",
 -    "jed": "^1.1.1",
-     "jquery": "^2.2.1",
+-    "jquery": "^2.2.1",
-     "jquery-ujs": "^1.2.1",
+-    "jquery-ujs": "^1.2.1",
-     "js-cookie": "^2.1.3",
+-    "js-cookie": "^2.1.3",
 -    "jszip": "^3.1.3",
-     "jszip-utils": "^0.0.2",
+-    "jszip-utils": "^0.0.2",
 -    "marked": "^0.3.6",
      "monaco-editor": "0.8.3",
 -    "mousetrap": "^1.4.6",
      "name-all-modules-plugin": "^1.0.1",
-     "pikaday": "^1.5.1",
+-    "pikaday": "^1.5.1",
      "prismjs": "^1.6.0",
      "raphael": "^2.2.7",
-     "raven-js": "^3.14.0",
+-    "raven-js": "^3.14.0",
 -    "raw-loader": "^0.5.1",
      "react-dev-utils": "^0.5.2",
      "select2": "3.5.2-browserify",
      "sql.js": "^0.4.0",
-@@ -56,14 +39,11 @@
+-    "three": "^0.84.0",
-     "three-orbit-controls": "^82.1.0",
+-    "three-orbit-controls": "^82.1.0",
-     "three-stl-loader": "^1.0.4",
+-    "three-stl-loader": "^1.0.4",
      "timeago.js": "^2.0.5",
 -    "underscore": "^1.8.3",
 -    "url-loader": "^0.5.8",
      "visibilityjs": "^1.2.4",
      "vue": "^2.2.6",
-     "vue-loader": "^11.3.4",
+-    "vue-loader": "^11.3.4",
-     "vue-resource": "^1.3.4",
+-    "vue-resource": "^1.3.4",
-     "vue-template-compiler": "^2.2.6",
+-    "vue-template-compiler": "^2.2.6",
 -    "webpack": "^3.4.0",
-     "webpack-bundle-analyzer": "^2.8.2",
+-    "webpack-bundle-analyzer": "^2.8.2",
-     "webpack-stats-plugin": "^0.1.5"
+-    "webpack-stats-plugin": "^0.1.5"
++    "vue-loader": "^11.3.4"
    },
+   "devDependencies": {
+     "babel-plugin-istanbul": "^4.0.0",
+--- a/config/webpack.config.js
++++ b/config/webpack.config.js
+@@ -7,7 +7,6 @@
+ var CopyWebpackPlugin = require('copy-webpack-plugin');
+ var CompressionPlugin = require('compression-webpack-plugin');
+ var NameAllModulesPlugin = require('name-all-modules-plugin');
+-var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+ var WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
+ 
+ var ROOT_PATH = '/usr/share/gitlab';
+@@ -304,16 +303,4 @@
+   }
+ }
+ 
+-if (WEBPACK_REPORT) {
+-  config.plugins.push(
+-    new BundleAnalyzerPlugin({
+-      analyzerMode: 'static',
+-      generateStatsFile: true,
+-      openAnalyzer: false,
+-      reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'),
+-      statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'),
+-    })
+-  );
+-}
+-
+ module.exports = config;

debian/patches/0430-remove-devdeps.patch

@@ -0,0 +1,28 @@
+--- a/package.json
++++ b/package.json
+@@ -30,25 +30,5 @@
+     "vue-loader": "^11.3.4"
+   },
+   "devDependencies": {
+-    "babel-plugin-istanbul": "^4.0.0",
+-    "eslint": "^3.10.1",
+-    "eslint-config-airbnb-base": "^10.0.1",
+-    "eslint-import-resolver-webpack": "^0.8.3",
+-    "eslint-plugin-filenames": "^1.1.0",
+-    "eslint-plugin-import": "^2.2.0",
+-    "eslint-plugin-jasmine": "^2.1.0",
+-    "eslint-plugin-promise": "^3.5.0",
+-    "istanbul": "^0.4.5",
+-    "jasmine-core": "^2.6.3",
+-    "jasmine-jquery": "^2.1.1",
+-    "karma": "^1.7.0",
+-    "karma-chrome-launcher": "^2.1.1",
+-    "karma-coverage-istanbul-reporter": "^0.2.0",
+-    "karma-jasmine": "^1.1.0",
+-    "karma-mocha-reporter": "^2.2.2",
+-    "karma-sourcemap-loader": "^0.3.7",
+-    "karma-webpack": "^2.0.4",
+-    "nodemon": "^1.11.0",
+-    "webpack-dev-server": "^2.6.1"
+   }
+ }

debian/patches/0500-use-umd.patch

@@ -0,0 +1,19 @@
+--- a/app/assets/javascripts/blob/3d_viewer/index.js
++++ b/app/assets/javascripts/blob/3d_viewer/index.js
+@@ -1,4 +1,4 @@
+-import * as THREE from 'three/build/three.module';
++import * as THREE from 'three/build/three';
+ import STLLoaderClass from 'three-stl-loader';
+ import OrbitControlsClass from 'three-orbit-controls';
+ import MeshObject from './mesh_object';
+--- a/app/assets/javascripts/blob/3d_viewer/mesh_object.js
++++ b/app/assets/javascripts/blob/3d_viewer/mesh_object.js
+@@ -2,7 +2,7 @@
+   Matrix4,
+   MeshLambertMaterial,
+   Mesh,
+-} from 'three/build/three.module';
++} from 'three/build/three';
+ 
+ const defaultColor = 0xE24329;
+ const materials = {

debian/patches/add-system-lib-path-for-webpack.patch

@@ -1,6 +1,6 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -245,6 +245,7 @@
+@@ -244,6 +244,7 @@
  
    resolve: {
      extensions: ['.js'],
@@ -8,7 +8,7 @@
      alias: {
        '~':              path.join(ROOT_PATH, 'app/assets/javascripts'),
        'emojis':         path.join(ROOT_PATH, 'fixtures/emojis'),
-@@ -254,7 +255,12 @@
+@@ -253,7 +254,12 @@
        'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
        'vue$':           'vue/dist/vue.esm.js',
      }

debian/patches/series

@@ -12,7 +12,14 @@ pid-log-paths.patch
 0280-relax-pg.patch
 0290-skip-peek-mysql2.patch
 0300-relax-rbnacl.patch
+0310-relax-rack-cors.patch
+0320-relax-fog-aws.patch
+0330-relax-acts-as-taggable-on.patch
+0340-relax-httparty.patch
+0350-relax-oj.patch
 0410-set-webpack-root.patch
 0420-use-system-libs.patch
+0430-remove-devdeps.patch
 add-system-lib-path-for-webpack.patch
 fix-mail-room-path.patch
+0500-use-umd.patch

debian/rake-tasks.sh

@@ -9,28 +9,31 @@ export DB RAILS_ENV
 cd /usr/share/gitlab
 
 # Check if the db is already present
-if [ "$(LANG=C runuser -u postgres -- sh -c "psql gitlab_production -c \"\d\"")" = \
+db_relations="$(LANG=C runuser -u postgres -- sh -c "psql gitlab_production -c \"\d\"" 2>&1)"
-"No relations found." ]; then
+if [ "$db_relations" = "No relations found." ] || \
+  [ "$db_relations" = "Did not find any relations." ]; then
   echo "Initializing database..."
   test -f ${gitlab_home}/db/schema.rb || \
   runuser -u ${gitlab_user} -- sh -c \
   "cp ${gitlab_data_dir}/db/schema.rb.template ${gitlab_data_dir}/db/schema.rb"
+  runuser -u ${gitlab_user} -- sh -c \
+  "touch ${gitlab_data_dir}/.gitlab_shell_secret"
   runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:schema:load'
-  runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:seed_fu'
 else
   echo "gitlab_production database is not empty, skipping gitlab setup"
-  runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:migrate'
 fi
 
+runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:migrate'
+
 # Restrict permissions for secret files
 chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
 
 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'
-runuser -u ${gitlab_user} -- sh -c 'npm install regexpu-core'
-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'
 
 echo "Precompiling assets..."
+# Workaround for sass not finding pikaday from global path
+runuser -u ${gitlab_user} -- sh -c 'cp -r /usr/lib/nodejs/pikaday /var/lib/gitlab/node_modules'
 runuser -u ${gitlab_user} -- sh -c 'bundle exec rake tmp:cache:clear assets:precompile'