From 0476dd0eb314dc7372383a971498bb40eadd9210 Mon Sep 17 00:00:00 2001
From: TheWillGabriel <will.gabriel@gmail.com>
Date: Sun, 13 Oct 2019 10:09:38 -0600
Subject: [PATCH 1/2] Add Rails version 6.0

---
 assets/javascripts/templates/pages/about_tmpl.coffee | 2 +-
 lib/docs/scrapers/rdoc/rails.rb                      | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index 985155ae..f0339d2c 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -658,7 +658,7 @@ credits = [
     'https://www.ruby-lang.org/en/about/license.txt'
   ], [
     'Ruby on Rails',
-    '2004-2017 David Heinemeier Hansson<br>Rails, Ruby on Rails, and the Rails logo are trademarks of David Heinemeier Hansson.',
+    '2004-2019 David Heinemeier Hansson<br>Rails, Ruby on Rails, and the Rails logo are trademarks of David Heinemeier Hansson.',
     'MIT',
     'https://raw.githubusercontent.com/rails/rails/master/activerecord/MIT-LICENSE'
   ], [
diff --git a/lib/docs/scrapers/rdoc/rails.rb b/lib/docs/scrapers/rdoc/rails.rb
index 0dec42a9..a34da598 100644
--- a/lib/docs/scrapers/rdoc/rails.rb
+++ b/lib/docs/scrapers/rdoc/rails.rb
@@ -63,17 +63,21 @@ module Docs
     options[:attribution] = ->(filter) do
       if filter.slug.start_with?('guides')
         <<-HTML
-          &copy; 2004&ndash;2018 David Heinemeier Hansson<br>
+          &copy; 2004&ndash;2019 David Heinemeier Hansson<br>
           Licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
         HTML
       else
         <<-HTML
-          &copy; 2004&ndash;2018 David Heinemeier Hansson<br>
+          &copy; 2004&ndash;2019 David Heinemeier Hansson<br>
           Licensed under the MIT License.
         HTML
       end
     end
 
+    version '6.0' do
+      self.release = '6.0.0'
+    end
+
     version '5.2' do
       self.release = '5.2.2'
     end

From 2fe6705fa450e220df550ba896b6c1cd98de5d00 Mon Sep 17 00:00:00 2001
From: TheWillGabriel <will.gabriel@gmail.com>
Date: Sun, 13 Oct 2019 10:10:05 -0600
Subject: [PATCH 2/2] Skip erroneous scraper results

---
 lib/docs/scrapers/rdoc/rails.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/docs/scrapers/rdoc/rails.rb b/lib/docs/scrapers/rdoc/rails.rb
index a34da598..aed22acb 100644
--- a/lib/docs/scrapers/rdoc/rails.rb
+++ b/lib/docs/scrapers/rdoc/rails.rb
@@ -45,6 +45,15 @@ module Docs
       ActiveSupport/Dependencies/WatchStack.html
       ActiveSupport/Notifications/Fanout.html)
 
+    # False positives found by docs:generate
+    options[:skip].concat %w(
+      ActionDispatch/www.example.com
+      ActionDispatch/Http/www.rubyonrails.org
+      ActionDispatch/Http/www.rubyonrails.co.uk
+      'TZ'
+      active_record_migrations.html
+      association_basics.html)
+
     options[:skip_patterns] += [
       /release_notes/,
       /\AActionController\/Testing/,