rearrange, remove unneeded deps

debian/control

@@ -38,7 +38,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-rails-deprecated-sanitizer (>= 1.0.3~),
  ruby-responders (>= 2.0~),
  ruby-sprockets (>= 3.6~),
- ruby-sprockets-es6 (>= 0.9.2~),
  ruby-default-value-for (>= 3~),
 #ruby-mysql2 | ruby-pg,
  ruby-pg (>= 0.18.4~),
@@ -52,7 +51,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-omniauth (>= 1.4.2~),
  ruby-omniauth-auth0 (>= 1.4.1~),
  ruby-omniauth-azure-oauth2 (>= 0.0.6~),
- ruby-omniauth-bitbucket (>= 0.0.2~),
  ruby-omniauth-cas3 (>= 1.1.4~),
  ruby-omniauth-facebook (>= 4.0~),
  ruby-omniauth-github (>= 1.1.1~),
@@ -118,12 +116,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-google-api-client,
 # for aws storage
  ruby-unf (>= 0.1.4-2~),
-# Authorization
- ruby-six (>= 0.2.0-3~),
 # Seed data
  ruby-seed-fu (>= 2.3.5~),
 # Markdown and HTML processing
- ruby-htmlentities (>= 4.3.3~),
  ruby-html-pipeline (>= 1.11.0),
  ruby-task-list (>= 2.0~),
  ruby-github-markup (>= 1.5.1~),
@@ -142,7 +137,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-diffy (>= 3.1~),
 # Application server
  unicorn (>= 5.1~),
-   ruby-unicorn-worker-killer (>= 0.4.4~),
+ ruby-unicorn-worker-killer (>= 0.4.4~),
 # State machine
  ruby-state-machines-activerecord (>= 0.4.0~),
 # Run events after state machine commits
@@ -150,7 +145,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 # Issue tags
  ruby-acts-as-taggable-on (>= 4.0~),
 # Background jobs
- ruby-sinatra (>= 1.4.7-4~),
  ruby-sidekiq (>= 5.0~),
  ruby-sidekiq-cron (>= 0.6~),
  ruby-redis-namespace,
@@ -169,8 +163,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-version-sorter (>= 2.1~),
 # Cache
  ruby-redis-rails (>= 5.0.1~),
-# Campfire integration
+# Redis
- ruby-tinder (>= 1.10.1-2~),
+ ruby-redis,
+ ruby-connection-pool (>= 2.0~),
 # HipChat integration
  ruby-hipchat (>= 1.5.0~),
 # JIRA integration
@@ -189,8 +184,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-kubeclient,
 # d3
  ruby-d3-rails (>= 3.1~),
-#cal-heatmap
- ruby-cal-heatmap-rails (>= 3.6.0~),
 # underscore-rails
  ruby-underscore-rails (>= 1.4~),
 # Sanitize user input
@@ -199,7 +192,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 # Sanitizes SVG input
  ruby-loofah (>= 2.0.3~),
 # Working with license
- ruby-licensee (>= 8.0.0-2~),
+ ruby-licensee (>= 8.7~),
 # Protect against bruteforcing
  ruby-rack-attack (>= 4.4.1~),
 # Ace editor
@@ -213,15 +206,14 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 # Parse time & duration
  ruby-chronic (>= 0.10.2-3~),
  ruby-chronic-duration,
+#
  ruby-webpack-rails,
  npm,
  ruby-rack-proxy,
+#
  ruby-sass-rails (>= 5.0.6~),
- ruby-coffee-rails (>= 4.1.0~),
- ruby-coffee-script-source (>= 1.10.0~),
  ruby-uglifier (>= 2.7.2~),
- ruby-turbolinks (>= 2.5.3-3~),
+#
- ruby-jquery-turbolinks (>= 2.1.0~),
  ruby-addressable (>= 2.3.8~),
  ruby-bootstrap-sass (>= 3.3.0~),
  ruby-font-awesome-rails (>= 4.7~),
@@ -229,28 +221,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-gon (>= 6.1~),
  ruby-jquery-atwho-rails (>= 1.3.2~),
  ruby-jquery-rails (>= 4.1~),
- ruby-jquery-scrollto-rails (>= 1.4.3~),
- ruby-jquery-ui-rails (>= 6.0~),
- ruby-nprogress-rails (>= 0.1.6.7~),
- ruby-raphael-rails (>= 2.1.2~),
  ruby-request-store (>= 1.3~),
  ruby-select2-rails (>= 3.5.9~),
  ruby-virtus (>= 1.0.5-3~),
- ruby-net-ssh (>= 1:4.0~),
-# Required for ED25519 SSH host key support
- ruby-rbnacl-libsodium,
- ruby-rbnacl,
- ruby-bcrypt-pbkdf,
  ruby-base32 (>= 0.3.0~),
-# Metrics
+# Sentry integration
- ruby-allocations (>= 1.0~),
- ruby-method-source (>= 0.8.2-2~),
- ruby-influxdb (>= 0.2~),
-# Prometheus
- ruby-prometheus-client-mmap,
- ruby-raindrops (>= 0.18~),
- ruby-connection-pool (>= 2.0~),
  ruby-sentry-raven (>= 2.5.3~),
+#
  ruby-premailer-rails (>= 1.9.7~),
 # I18n
  ruby-parser (>= 3.8.2~),
@@ -267,16 +244,22 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-peek-rblineprof,
  ruby-peek-redis,
  ruby-peek-sidekiq,
-# ruby-actionmailer,
+# Metrics
- ruby-mail (>= 2.5.4~),
+ ruby-allocations (>= 1.0~),
+ ruby-method-source (>= 0.8.2-2~),
+ ruby-influxdb (>= 0.2~),
+# Prometheus
+ ruby-prometheus-client-mmap,
+ ruby-raindrops (>= 0.18~),
+#
  ruby-octokit (>= 4.3.0~),
+#
  ruby-mail-room (>= 0.9.1~),
+#
  ruby-email-reply-trimmer (>= 0.1~),
  ruby-html2text,
+#
  ruby-prof (>= 0.16.2~),
-## CI
- ruby-activerecord-session-store (>= 1.0~),
- ruby-nested-form (>= 0.3.2-2~),
 # OAuth
  ruby-oauth2 (>= 1.3~),
 # Soft deletion
@@ -286,8 +269,15 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
 # System information
  ruby-vmstat (>= 2.3~),
  ruby-sys-filesystem,
+# SSH host key support
+ ruby-net-ssh (>= 1:4.0~),
+# Required for ED25519 SSH host key support
+ ruby-rbnacl-libsodium,
+ ruby-rbnacl,
+ ruby-bcrypt-pbkdf,
 # Gitaly GRPC client
  ruby-gitaly (>= 0.26~),
+#
  ruby-toml-rb,
 # Feature toggles
  ruby-flipper,