From 094e4083851e7c89f9f7682f2d9e27afe8a135e1 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sun, 17 Mar 2019 17:22:59 +0530
Subject: [PATCH] Drop patch which expected rails 5.2

---
 debian/patches/0680-rails-5_2.patch | 61 -----------------------------
 debian/patches/series               |  1 -
 2 files changed, 62 deletions(-)
 delete mode 100644 debian/patches/0680-rails-5_2.patch

diff --git a/debian/patches/0680-rails-5_2.patch b/debian/patches/0680-rails-5_2.patch
deleted file mode 100644
index 2b7a96e8bc..0000000000
--- a/debian/patches/0680-rails-5_2.patch
+++ /dev/null
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
index d60a177c8e..12fd9d7795 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,7 +22,6 @@
 0660-fix-gitlab-yml-path.patch
 0670-allow-doorkeepr-4_3.patch
 0680-rails-5_1.patch
-0680-rails-5_2.patch
 0685-bump-fog.patch
 0686-rails-5.1-embed.patch
 0687-opentracing-embed.patch