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

@@ -668,7 +668,7 @@ credits = [ · 667 unmodified lines
668	668	'https://www.ruby-lang.org/en/about/license.txt'
669	669	], [
670	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	672	'MIT',
673	673	'https://raw.githubusercontent.com/rails/rails/master/activerecord/MIT-LICENSE'
674	674	], [

@@ -45,6 +45,15 @@ module Docs · 44 unmodified lines
45	45	ActiveSupport/Dependencies/WatchStack.html
46	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	57	options[:skip_patterns] += [
49	58	/release_notes/,
50	59	/\AActionController\/Testing/,
@@ -63,17 +72,21 @@ module Docs · 12 unmodified lines
63	72	options[:attribution] = ->(filter) do
64	73	if filter.slug.start_with?('guides')
65	74	<<-HTML
66		− © 2004–2018 David Heinemeier Hansson<br>
	75	+ © 2004–2019 David Heinemeier Hansson<br>
67	76	Licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
68	77	HTML
69	78	else
70	79	<<-HTML
71		− © 2004–2018 David Heinemeier Hansson<br>
	80	+ © 2004–2019 David Heinemeier Hansson<br>
72	81	Licensed under the MIT License.
73	82	HTML
74	83	end
75	84	end
76	85
	86	+ version '6.0' do
	87	+ self.release = '6.0.0'
	88	+ end
	89	+
77	90	version '5.2' do
78	91	self.release = '5.2.2'
79	92	end