Merge pull request #1462 from malkoG/rails-6.1

Update Rails documentation (6.1.0)

assets/javascripts/templates/pages/about_tmpl.coffee

@@ -718,7 +718,7 @@ credits = [
     'https://www.ruby-lang.org/en/about/license.txt'
   ], [
     'Ruby on Rails',
-    '2004-2019 David Heinemeier Hansson<br>Rails, Ruby on Rails, and the Rails logo are trademarks of David Heinemeier Hansson.',
+    '2004-2020 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'
   ], [

lib/docs/filters/rails/clean_html_guides.rb

@@ -23,9 +23,10 @@ module Docs
         end
 
         css('pre').each do |node|
-          language = node['class'][/brush: ?(\w+)/, 1]
+          code = node.at_css('code')
+          language = code['class'][/highlight ?(\w+)/, 1]
           node['data-language'] = language unless language == 'plain'
-          node.remove_attribute('class')
+          code.remove_attribute('class')
           node.content = node.content.strip
         end
 

lib/docs/scrapers/rdoc/rails.rb

@@ -72,17 +72,21 @@ module Docs
     options[:attribution] = ->(filter) do
       if filter.slug.start_with?('guides')
         <<-HTML
-          &copy; 2004&ndash;2019 David Heinemeier Hansson<br>
+          &copy; 2004&ndash;2020 David Heinemeier Hansson<br>
           Licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
         HTML
       else
         <<-HTML
-          &copy; 2004&ndash;2019 David Heinemeier Hansson<br>
+          &copy; 2004&ndash;2020 David Heinemeier Hansson<br>
           Licensed under the MIT License.
         HTML
       end
     end
 
+    version '6.1' do
+      self.release = '6.1.1'
+    end
+
     version '6.0' do
       self.release = '6.0.0'
     end