History

Merge pull request #1109 from TheWillGabriel/rails-6.0

Update Rails documentation (6.0.0)

Jasper van Merle committed 7 years ago

Commit 9b63f462 parents 399387f 2fe67052 files · +16 −3Browse files

Unified · Split

2 files
  1. assets/javascripts/templates/pages/about_tmpl.coffee +1 −1
  2. lib/docs/scrapers/rdoc/rails.rb +15 −2
assets/javascripts/templates/pages/about_tmpl.coffee+1−1
@@ -668,7 +668,7 @@ credits = [ · 667 unmodified lines
668 'https://www.ruby-lang.org/en/about/license.txt'668 'https://www.ruby-lang.org/en/about/license.txt'
669 ], [669 ], [
670 'Ruby on Rails',670 'Ruby on Rails',
671 '2004-2017 David Heinemeier Hansson<br>Rails, Ruby on Rails, and the Rails logo are trademarks of David Heinemeier Hansson.',671 '2004-2019 David Heinemeier Hansson<br>Rails, Ruby on Rails, and the Rails logo are trademarks of David Heinemeier Hansson.',
672 'MIT',672 'MIT',
673 'https://raw.githubusercontent.com/rails/rails/master/activerecord/MIT-LICENSE'673 'https://raw.githubusercontent.com/rails/rails/master/activerecord/MIT-LICENSE'
674 ], [674 ], [
lib/docs/scrapers/rdoc/rails.rb+15−2
@@ -45,6 +45,15 @@ module Docs · 44 unmodified lines
45 ActiveSupport/Dependencies/WatchStack.html45 ActiveSupport/Dependencies/WatchStack.html
46 ActiveSupport/Notifications/Fanout.html)46 ActiveSupport/Notifications/Fanout.html)
47 47
48 # False positives found by docs:generate
49 options[:skip].concat %w(
50 ActionDispatch/www.example.com
51 ActionDispatch/Http/www.rubyonrails.org
52 ActionDispatch/Http/www.rubyonrails.co.uk
53 'TZ'
54 active_record_migrations.html
55 association_basics.html)
56
48 options[:skip_patterns] += [57 options[:skip_patterns] += [
49 /release_notes/,58 /release_notes/,
50 /\AActionController\/Testing/,59 /\AActionController\/Testing/,
@@ -63,17 +72,21 @@ module Docs · 12 unmodified lines
63 options[:attribution] = ->(filter) do72 options[:attribution] = ->(filter) do
64 if filter.slug.start_with?('guides')73 if filter.slug.start_with?('guides')
65 <<-HTML74 <<-HTML
66 &copy; 2004&ndash;2018 David Heinemeier Hansson<br>75 &copy; 2004&ndash;2019 David Heinemeier Hansson<br>
67 Licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.76 Licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
68 HTML77 HTML
69 else78 else
70 <<-HTML79 <<-HTML
71 &copy; 2004&ndash;2018 David Heinemeier Hansson<br>80 &copy; 2004&ndash;2019 David Heinemeier Hansson<br>
72 Licensed under the MIT License.81 Licensed under the MIT License.
73 HTML82 HTML
74 end83 end
75 end84 end
76 85
86 version '6.0' do
87 self.release = '6.0.0'
88 end
89
77 version '5.2' do90 version '5.2' do
78 self.release = '5.2.2'91 self.release = '5.2.2'
79 end92 end