Merge pull request #1109 from TheWillGabriel/rails-6.0

Update Rails documentation (6.0.0)
pull/1117/head
Jasper van Merle 5 years ago
commit 9b63f4625f

@ -668,7 +668,7 @@ credits = [
'https://www.ruby-lang.org/en/about/license.txt' 'https://www.ruby-lang.org/en/about/license.txt'
], [ ], [
'Ruby on Rails', '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', 'MIT',
'https://raw.githubusercontent.com/rails/rails/master/activerecord/MIT-LICENSE' 'https://raw.githubusercontent.com/rails/rails/master/activerecord/MIT-LICENSE'
], [ ], [

@ -45,6 +45,15 @@ module Docs
ActiveSupport/Dependencies/WatchStack.html ActiveSupport/Dependencies/WatchStack.html
ActiveSupport/Notifications/Fanout.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] += [ options[:skip_patterns] += [
/release_notes/, /release_notes/,
/\AActionController\/Testing/, /\AActionController\/Testing/,
@ -63,17 +72,21 @@ module Docs
options[:attribution] = ->(filter) do options[:attribution] = ->(filter) do
if filter.slug.start_with?('guides') if filter.slug.start_with?('guides')
<<-HTML <<-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. Licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
HTML HTML
else else
<<-HTML <<-HTML
&copy; 2004&ndash;2018 David Heinemeier Hansson<br> &copy; 2004&ndash;2019 David Heinemeier Hansson<br>
Licensed under the MIT License. Licensed under the MIT License.
HTML HTML
end end
end end
version '6.0' do
self.release = '6.0.0'
end
version '5.2' do version '5.2' do
self.release = '5.2.2' self.release = '5.2.2'
end end

Loading…
Cancel
Save