rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #15889 from carnesmedia/model-name	Rafael Mendonça França	2014-08-17	13	-24/+28
\|\
\| *	Use #model_name on instances instead of classes	Amiel Martin	2014-06-24	13	-24/+28
* \|	Merge pull request #16062 from sgrif/sg-required-generators	Rafael Mendonça França	2014-08-17	6	-6/+82
\|\ \
\| * \|	Add a `required` option to the model generator	Sean Griffin	2014-08-08	6	-6/+82
* \| \|	Merge branch 'loofah'	Rafael Mendonça França	2014-08-17	47	-4739/+281
\|\ \ \
\| * \ \	Merge branch 'master' into loofah	Rafael Mendonça França	2014-08-17	196	-1669/+3586
\| \|\ \ \
\| * \| \| \|	Use the release gems and point application gemfile to right loofah	Rafael Mendonça França	2014-08-17	2	-5/+5
\| * \| \| \|	Merge pull request #16525 from kaspth/partial-release-prep	Rafael Mendonça França	2014-08-17	7	-39/+46
\| \|\ \ \ \
\| \| * \| \| \|	Prepare for partial release.	Kasper Timm Hansen	2014-08-17	7	-39/+46
\| \|/ / / /
\| * \| \| \|	Merge branch 'master' into loofah	Rafael Mendonça França	2014-08-12	415	-3045/+5699
\| \|\ \ \ \
\| * \| \| \| \|	Use the plugin API to the getter and setters	Rafael Mendonça França	2014-07-15	1	-4/+4
\| * \| \| \| \|	Use regexp instead exact match for atom test	Rafael Mendonça França	2014-07-15	1	-3/+2
\| * \| \| \| \|	All these tests are passing now	Rafael Mendonça França	2014-07-15	3	-7/+0
\| * \| \| \| \|	Remove more unneeded include	Rafael Mendonça França	2014-07-15	1	-3/+0
\| * \| \| \| \|	Defining the right dependencies	Rafael Mendonça França	2014-07-15	3	-1/+5
\| * \| \| \| \|	We don't need loofah for the assertions	Rafael Mendonça França	2014-07-15	5	-10/+7
\| * \| \| \| \|	Include the selector assertions on the test case	Rafael Mendonça França	2014-07-15	3	-5/+2
\| * \| \| \| \|	Rails is a module not a class	Rafael Mendonça França	2014-07-15	1	-1/+1
\| * \| \| \| \|	Merge pull request #11218 from kaspth/loofah-integration	Rafael Mendonça França	2014-07-10	45	-4736/+284
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Restore delivery method on teardowns.	Timm	2014-06-16	1	-3/+2
\| \| * \| \| \| \|	Inline Assertion reference.	Timm	2014-06-16	1	-3/+4
\| \| * \| \| \| \|	Remove response faking.	Timm	2014-06-16	1	-15/+1
\| \| * \| \| \| \|	Use 1.9 syntax.	Timm	2014-06-16	1	-6/+6
\| \| * \| \| \| \|	Add document_root_element to ActionDispatch::IntegrationTest so assert_select...	Timm	2014-06-16	1	-0/+4
\| \| * \| \| \| \|	Make output_buffers used in tests be utf-8 encoded. Fixing unknown encoding A...	Timm	2014-06-16	1	-1/+3
\| \| * \| \| \| \|	Change date helper tests to expect attributes with double quoted strings.	Timm	2014-06-16	1	-14/+15
\| \| * \| \| \| \|	Fix invalid css selectors in form_collections_helper_test.rb.	Timm	2014-06-16	1	-11/+11
\| \| * \| \| \| \|	Don't splat arguments to allowed tags or attributes.	Timm	2014-06-16	1	-2/+2
\| \| * \| \| \| \|	Change sanitizer_vendor to just be a method and reword documentation.	Timm	2014-06-16	1	-4/+5
\| \| * \| \| \| \|	Revert some stuff to use the new sanitizers.	Timm	2014-06-16	1	-6/+6
\| \| * \| \| \| \|	Point gems to all the right places.	Timm	2014-06-16	1	-4/+4
\| \| * \| \| \| \|	Remove html-scanner and its tests.	Timm	2014-06-16	13	-2454/+0
\| \| * \| \| \| \|	Remove deprecation notice.	Timm	2014-06-16	1	-2/+0
\| \| * \| \| \| \|	Add a layer of indirection making sanitizers pluggable.	Timm	2014-06-16	3	-3/+23
\| \| * \| \| \| \|	Delegate allowed tags and attributes setting to HTML::WhiteListSanitizer.	Timm	2014-06-16	1	-4/+4
\| \| * \| \| \| \|	Changed configuration documentation to no longer state it replaces a Set.	Timm	2014-06-16	1	-2/+2
\| \| * \| \| \| \|	Deprecate configurations and use allowed_tags and allowed_attributes on White...	Timm	2014-06-16	1	-99/+22
\| \| * \| \| \| \|	Remove include of rails-dom-testing in rails_info_controller_test.rb as it is...	Timm	2014-06-16	1	-3/+0
\| \| * \| \| \| \|	Migrated test away from escaped quotes.	Timm	2014-06-16	1	-1/+1
\| \| * \| \| \| \|	Made deprecation messages in sanitize_helper more clear.	Timm	2014-06-16	1	-3/+3
\| \| * \| \| \| \|	Remove unneeded comment in test.	Timm	2014-06-16	1	-1/+1
\| \| * \| \| \| \|	Remove some whitespace in actionpack.gemspec.	Timm	2014-06-16	1	-3/+0
\| \| * \| \| \| \|	Updated CHANGELOG message to include info about rails-html-sanitizer.	Timm	2014-06-16	1	-2/+3
\| \| * \| \| \| \|	Updated CHANGELOG message about rails-dom-testing.	Timm	2014-06-16	1	-12/+3
\| \| * \| \| \| \|	Completed integration of rails-html-sanitizer in SanitizeHelper. Deprecated p...	Timm	2014-06-16	3	-294/+19
\| \| * \| \| \| \|	Moved html_document to ActionDispatch::Assertions. Included the Rails::Dom::T...	Timm	2014-06-16	2	-7/+13
\| \| * \| \| \| \|	Updated html-scanner deprecation message.	Timm	2014-06-16	1	-1/+1
\| \| * \| \| \| \|	Support for changes in SelectorAssertions.	Timm	2014-06-16	2	-5/+20
\| \| * \| \| \| \|	Included rails-dom-testing in rails_info_controller_test.rb	Timm	2014-06-16	1	-0/+3
\| \| * \| \| \| \|	Fixed deprecated selector in form_collections_helper_test.rb with from catch_...	Timm	2014-06-16	1	-1/+1