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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \|	Corrected documentation bug.	Timm	2014-06-15	1	-10/+57
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Removed whitespace between dependencies.	Timm	2014-06-15	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Updated documentation to tell that a custom scrubber takes precedence.	Timm	2014-06-15	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Updated the documentation to reflect the scrubber option.	Timm	2014-06-15	1	-1/+22
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Marked the private API as not needing code documentation.	Timm	2014-06-15	2	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added ability to pass a custom scrubber to sanitize. Includes test coverage.	Timm	2014-06-15	2	-1/+39
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Moved requiring of Loofah from sanitizers.rb to action_view.rb.	Timm	2014-06-15	2	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Marked tests in sanitize_helper_test.rb as pending.	Timm	2014-06-15	1	-8/+29
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Marked a test in form_helper_test.rb as pending because of unknown encoding ↵	Timm	2014-06-15	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ASCII-8BIT output error.
\| \| * \| \| \| \| \|	Marked some tests as pending in date_helper_test.rb.	Timm	2014-06-15	1	-0/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added some tests for ActionView::Sanitizer.	Timm	2014-06-15	1	-0/+32
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added ActionView::Sanitizer and moved remove_xpaths to there.	Timm	2014-06-15	1	-7/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Changed the description of some pending tests. Changed the expected output ↵	Timm	2014-06-15	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of a script test.
\| \| * \| \| \| \| \|	Extracted one highlight test method and marked it as pending.	Timm	2014-06-15	1	-0/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added comment removal. Changed definitation of remove_xpaths to not use a ↵	Timm	2014-06-15	1	-11/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	splat operator.
\| \| * \| \| \| \| \|	Extracted the xpath removals into some new API that allows users to remove ↵	Timm	2014-06-15	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	xpath subtrees.
\| \| * \| \| \| \| \|	Added removal of script tags to WhiteListSanitizer.	Timm	2014-06-15	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Renamed the SanitizerTest class to SanitersTest, to remove the conflict with ↵	Timm	2014-06-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the old SanitizerTest for html-scanner.
\| \| * \| \| \| \| \|	Added video poster sanitization testing (from @vipulnsward).	Timm	2014-06-15	1	-0/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Extracted failing tests in santiizers_test.rb into their own methods and ↵	Timm	2014-06-15	1	-7/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	marked them as pending.
\| \| * \| \| \| \| \|	Added guard clauses to FullSanitizer.	Timm	2014-06-15	1	-1/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	bad_tags include form since we remove it. Also to prevent a ↵	Timm	2014-06-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	should_allow_form_tag test creation.
\| \| * \| \| \| \| \|	Changed expected value from '<b>' to empty string.	Timm	2014-06-15	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Removed the contains_bad_protocols? method as well as the tests for it. ↵	Timm	2014-06-15	2	-41/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loofah already deals with this.
\| \| * \| \| \| \| \|	Reordered form removal with stripping.	Timm	2014-06-15	2	-5/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added PermitScrubber which allows you to permit elements for sanitization.	Timm	2014-06-15	2	-13/+85
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Removed duplication in the deprecated methods.	Timm	2014-06-15	1	-5/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added Loofah as a dependency in actionview.gemspec.	Timm	2014-06-11	7	-32/+485
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implemented ActionView: FullSanitizer, LinkSanitizer and WhiteListSanitizer in sanitizers.rb. Deprecated protocol_separator and bad_tags. Added new tests in sanitizers_test.rb and reimplemented assert_dom_equal with Loofah.
* \| \| \| \| \| \| \|	Use released arel	Rafael Mendonça França	2014-08-17	2	-2/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #16533 from lucasmazza/lm-named-routes-helper	Rafael Mendonça França	2014-08-17	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|	Deprecate NamedRouteCollection#helpers.
\| * \| \| \| \| \| \|	Deprecate NamedRouteCollection#helpers.	Lucas Mazza	2014-08-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method was removed at 210b338db20b1cdd0684f40bd78b52ed16148b99 but it is used by third party gems to check if a named route was defined. To help on the upgrade path on 4.2.0 we bring it back and emit a deprecation warning.
* \| \| \| \| \| \| \|	Merge pull request #16481 from sgrif/sg-change-default-timestamps	David Heinemeier Hansson	2014-08-17	14	-27/+105
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change the default `null` value for timestamps
\| * \| \| \| \| \| \| \|	Change the default `null` value for timestamps	Sean Griffin	2014-08-12	14	-27/+105
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As per discussion, this changes the model generators to specify `null: false` for timestamp columns. A warning is now emitted if `timestamps` is called without a `null` option specified, so we can safely change the behavior when no option is specified in Rails 5.
* \| \| \| \| \| \| \|	Merge pull request #16294 from bf4/code_tools	Rafael Mendonça França	2014-08-17	5	-127/+159
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Update, unify, encapsulate, and fix various code tools in Rails
\| * \| \| \| \| \| \|	Encapsulate rake lines from ActiveRecord/ActionPack as CodeTools::LineStatistics	Benjamin Fleischer	2014-07-25	3	-42/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Fail profiler fast when input is not a ruby file	Benjamin Fleischer	2014-07-25	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Optionally add String extensions for ruby-prof printer option	Benjamin Fleischer	2014-07-25	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Encapsulate tools/profile functionality in CodeTools::Profiler	Benjamin Fleischer	2014-07-25	1	-52/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug in path expansion of input filepath [ci skip]
\| * \| \| \| \| \| \|	Correct tools/profile usage example	Benjamin Fleischer	2014-07-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Remove unused, broken, legacy ruby-prof extension from 2005	Benjamin Fleischer	2014-07-25	1	-35/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Add CHANGELOG entry for #deliver_later	David Heinemeier Hansson	2014-08-17	1	-0/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/rails	David Heinemeier Hansson	2014-08-17	81	-10/+2220
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge pull request #16485 from seuros/activejob	David Heinemeier Hansson	2014-08-17	80	-9/+2219
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integrate ActiveJob / DeliverLater / GlobalID with Rails
\| \| * \| \| \| \| \| \| \|	[ActiveJob] require global_id/railtie	Abdelkader Boudih	2014-08-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	[ActiveJob] raise DeserializationError when got an error deserializing	Cristian Bica	2014-08-17	4	-0/+27
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	[ActiveJob] Add deserialize_arguments method to job	Abdelkader Boudih	2014-08-17	1	-1/+7
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	[ActiveJob] Fix tests for sucker_punch	Abdelkader Boudih	2014-08-17	8	-12/+32
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	[ActiveJob] Use globalid gem	Abdelkader Boudih	2014-08-17	9	-14/+11
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	[ActiveJob] make the resque-scheduler optional	Cristian Bica	2014-08-17	1	-3/+6
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	[ActiveJob] remove ruby warnings	Abdelkader Boudih	2014-08-17	2	-3/+3
\| \| \| \| \| \| \| \| \| \|