Merge tag 'debian/11.8.2-3' into buster-fasttrack

debian/README.Debian

@@ -145,3 +145,8 @@ The steps involve dropping into rails console as gitlab user for production envi
     irb(main):001:0> user = User.find_by(email: 'useraddress@domain')
     irb(main):003:0> user.admin=true
     irb(main):004:0> user.save
+
+Latest information regarding supported versions
+===============================================
+Subscribe to https://wiki.debian.org/gitlab to get updates about new package
+versions in unofficial repositories.

debian/changelog

@@ -1,3 +1,15 @@
+gitlab (11.8.2-3) unstable; urgency=medium
+
+  * Add link to gitlab page on Debian wiki in README.Debian
+  * Set minimum version of ruby to 1:2.5~ and add conflict with libruby2.3
+    (to support smooth upgrading from stretch-backports)
+  * Tighten dependency on ruby-lograge
+  * Remove obsolete config files
+  * Drop patch which expected rails 5.2
+  * Handle migration from rails 4.2
+
+ -- Pirate Praveen <praveen@debian.org>  Sun, 17 Mar 2019 18:34:25 +0530
+
 gitlab (11.8.2-2+fto10+1) buster-fasttrack; urgency=medium
 
   * Rebuild for buster-fasttrack

debian/control

@@ -19,7 +19,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends},
  gitlab-common (= ${source:Version}),
- ruby | ruby-interpreter,
+ ruby (>= 1:2.5~),
  lsb-base (>= 3.0-6),
  rake (>= 12.3.0~),
  bundler,
@@ -298,7 +298,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-flipper-active-record (>= 0.13~),
  ruby-flipper-active-support-cache-store (>= 0.13~),
 # Structured logging
- ruby-lograge (>= 0.5~),
+ ruby-lograge (>= 0.10~),
  ruby-grape-logging (>= 1.7~),
 # Vendored js files
 # Keeping this to ease backporting as it is in contrib anyway
@@ -349,6 +349,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # node-katex
 Recommends: certbot,
  gitaly (>= 1.20~)
+Conflicts: libruby2.3
 Description: git powered software platform to collaborate on code (non-omnibus)
  gitlab provides web based interface to host source code and track issues.
  It allows anyone for fork a repository and send merge requests. Code review

debian/maintscript

@@ -7,4 +7,10 @@ rm_conffile /etc/gitlab/initializers/additional_headers_interceptor.rb   11.2.8+
 rm_conffile /etc/gitlab/initializers/asset_sync.rb  11.5.3+dfsg-1    gitlab
 rm_conffile /etc/gitlab/initializers/email_template_interceptor.rb   11.2.8+dfsg-1    gitlab
 rm_conffile /etc/gitlab/initializers/active_record_verbose_query_logs.rb   11.6.0+dfsg-1    gitlab
+rm_conffile /etc/gitlab/initializers/active_record_array_type_casting.rb   11.8.2-3    gitlab
+rm_conffile /etc/gitlab/initializers/active_record_avoid_type_casting_in_uniqueness_validator.rb   11.8.2-3    gitlab
+rm_conffile /etc/gitlab/initializers/active_record_locking.rb  11.8.2-3    gitlab
+rm_conffile /etc/gitlab/initializers/application_controller_renderer.rb  11.8.2-3    gitlab
+rm_conffile /etc/gitlab/initializers/ar5_batching.rb  11.8.2-3    gitlab
+rm_conffile /etc/gitlab/initializers/ar5_pg_10_support.rb  11.8.2-3    gitlab
 dir_to_symlink /usr/share/gitlab/app/assets/javascripts/locale	/var/lib/gitlab/locale         9.5.4+dfsg-5  gitlab

debian/patches/0680-rails-5-migrations.patch

@@ -0,0 +1,20 @@
+--- a/db/migrate/20181027114222_add_first_day_of_week_to_user_preferences.rb
++++ b/db/migrate/20181027114222_add_first_day_of_week_to_user_preferences.rb
+@@ -1,6 +1,6 @@
+ # frozen_string_literal: true
+ 
+-class AddFirstDayOfWeekToUserPreferences < ActiveRecord::Migration
++class AddFirstDayOfWeekToUserPreferences < ActiveRecord::Migration[4.2]
+   DOWNTIME = false
+ 
+   def change
+--- a/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb
++++ b/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb
+@@ -1,6 +1,6 @@
+ # frozen_string_literal: true
+ 
+-class AddFirstDayOfWeekToApplicationSettings < ActiveRecord::Migration
++class AddFirstDayOfWeekToApplicationSettings < ActiveRecord::Migration[4.2]
+   include Gitlab::Database::MigrationHelpers
+   disable_ddl_transaction!
+ 

debian/patches/0680-rails-5_2.patch

@@ -1,61 +0,0 @@
-This monkey patch is not require with rails 5.2
-
---- a/config/initializers/active_record_verbose_query_logs.rb
-+++ /dev/null
-@@ -1,56 +0,0 @@
--# frozen_string_literal: true
--
--# This is backport of https://github.com/rails/rails/pull/26815/files
--# Enabled by default for every non-production environment
--
--module ActiveRecord
--  class LogSubscriber
--    module VerboseQueryLogs
--      def debug(progname = nil, &block)
--        return unless super
--
--        log_query_source
--      end
--
--      def log_query_source
--        source_line, line_number = extract_callstack(caller_locations)
--
--        if source_line
--          if defined?(::Rails.root)
--            app_root = "#{::Rails.root}/".freeze
--            source_line = source_line.sub(app_root, "")
--          end
--
--          logger.debug("  ↳ #{source_line}:#{line_number}")
--        end
--      end
--
--      def extract_callstack(callstack)
--        line = callstack.find do |frame|
--          frame.absolute_path && !ignored_callstack(frame.absolute_path)
--        end
--
--        offending_line = line || callstack.first
--        [
--          offending_line.path,
--          offending_line.lineno,
--          offending_line.label
--        ]
--      end
--
--      LOG_SUBSCRIBER_FILE = ActiveRecord::LogSubscriber.method(:logger).source_location.first
--      RAILS_GEM_ROOT = File.expand_path("../../../..", LOG_SUBSCRIBER_FILE) + "/"
--      APP_CONFIG_ROOT = File.expand_path("..", __dir__) + "/"
--
--      def ignored_callstack(path)
--        path.start_with?(APP_CONFIG_ROOT, RAILS_GEM_ROOT, RbConfig::CONFIG["rubylibdir"])
--      end
--    end
--
--    if Rails.version.start_with?("5.2")
--      raise "Remove this monkey patch: #{__FILE__}"
--    else
--      prepend(VerboseQueryLogs) unless Rails.env.production?
--    end
--  end
--end

debian/patches/series

@@ -22,7 +22,7 @@
 0660-fix-gitlab-yml-path.patch
 0670-allow-doorkeepr-4_3.patch
 0680-rails-5_1.patch
-0680-rails-5_2.patch
+0680-rails-5-migrations.patch
 0685-bump-fog.patch
 0686-rails-5.1-embed.patch
 0687-opentracing-embed.patch