aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Sync railties release notes [ci skip]Godfrey Chan2014-08-181-0/+40
* Merge pull request #16528 from byroot/add-test-case-for-nested-array-in-where...Santiago Pastorino2014-08-181-0/+4
|\
| * Add a test case of nested empty array values in conditionsJean Boussier2014-08-171-0/+4
* | "warning: `*' interpreted as argument prefix"Akira Matsuda2014-08-1810-10/+10
* | Merge pull request #16540 from jonatack/patch-9Eileen M. Uchitelle2014-08-181-1/+1
|\ \
| * | Fix rails-html_sanitizer in Gemfile templateJon Atack2014-08-181-1/+1
|/ /
* | Expectations firstAkira Matsuda2014-08-187-34/+34
* | Expectations firstAkira Matsuda2014-08-181-4/+4
* | Merge pull request #16534 from lucasmazza/lm-fix-rescue-testRafael Mendonça França2014-08-171-0/+1
|\ \
| * | Fix ActiveJob isolation tests.Lucas Mazza2014-08-171-0/+1
|/ /
* | No need to check model_name anymoreRafael Mendonça França2014-08-171-4/+2
* | Merge pull request #15889 from carnesmedia/model-nameRafael Mendonça França2014-08-1713-24/+28
|\ \
| * | Use #model_name on instances instead of classesAmiel Martin2014-06-2413-24/+28
* | | Merge pull request #16062 from sgrif/sg-required-generatorsRafael Mendonça França2014-08-176-6/+82
|\ \ \
| * | | Add a `required` option to the model generatorSean Griffin2014-08-086-6/+82
* | | | Merge branch 'loofah'Rafael Mendonça França2014-08-1747-4739/+281
|\ \ \ \
| * \ \ \ Merge branch 'master' into loofahRafael Mendonça França2014-08-17196-1669/+3586
| |\ \ \ \
| * | | | | Use the release gems and point application gemfile to right loofahRafael Mendonça França2014-08-172-5/+5
| * | | | | Merge pull request #16525 from kaspth/partial-release-prepRafael Mendonça França2014-08-177-39/+46
| |\ \ \ \ \
| | * | | | | Prepare for partial release.Kasper Timm Hansen2014-08-177-39/+46
| |/ / / / /
| * | | | | Merge branch 'master' into loofahRafael Mendonça França2014-08-12415-3045/+5699
| |\ \ \ \ \
| * | | | | | Use the plugin API to the getter and settersRafael Mendonça França2014-07-151-4/+4
| * | | | | | Use regexp instead exact match for atom testRafael Mendonça França2014-07-151-3/+2
| * | | | | | All these tests are passing nowRafael Mendonça França2014-07-153-7/+0
| * | | | | | Remove more unneeded includeRafael Mendonça França2014-07-151-3/+0
| * | | | | | Defining the right dependenciesRafael Mendonça França2014-07-153-1/+5
| * | | | | | We don't need loofah for the assertionsRafael Mendonça França2014-07-155-10/+7
| * | | | | | Include the selector assertions on the test caseRafael Mendonça França2014-07-153-5/+2
| * | | | | | Rails is a module not a classRafael Mendonça França2014-07-151-1/+1
| * | | | | | Merge pull request #11218 from kaspth/loofah-integrationRafael Mendonça França2014-07-1045-4736/+284
| |\ \ \ \ \ \
| | * | | | | | Restore delivery method on teardowns.Timm2014-06-161-3/+2
| | * | | | | | Inline Assertion reference.Timm2014-06-161-3/+4
| | * | | | | | Remove response faking.Timm2014-06-161-15/+1
| | * | | | | | Use 1.9 syntax.Timm2014-06-161-6/+6
| | * | | | | | Add document_root_element to ActionDispatch::IntegrationTest so assert_select...Timm2014-06-161-0/+4
| | * | | | | | Make output_buffers used in tests be utf-8 encoded. Fixing unknown encoding A...Timm2014-06-161-1/+3
| | * | | | | | Change date helper tests to expect attributes with double quoted strings.Timm2014-06-161-14/+15
| | * | | | | | Fix invalid css selectors in form_collections_helper_test.rb.Timm2014-06-161-11/+11
| | * | | | | | Don't splat arguments to allowed tags or attributes.Timm2014-06-161-2/+2
| | * | | | | | Change sanitizer_vendor to just be a method and reword documentation.Timm2014-06-161-4/+5
| | * | | | | | Revert some stuff to use the new sanitizers.Timm2014-06-161-6/+6
| | * | | | | | Point gems to all the right places.Timm2014-06-161-4/+4
| | * | | | | | Remove html-scanner and its tests.Timm2014-06-1613-2454/+0
| | * | | | | | Remove deprecation notice.Timm2014-06-161-2/+0
| | * | | | | | Add a layer of indirection making sanitizers pluggable.Timm2014-06-163-3/+23
| | * | | | | | Delegate allowed tags and attributes setting to HTML::WhiteListSanitizer.Timm2014-06-161-4/+4
| | * | | | | | Changed configuration documentation to no longer state it replaces a Set.Timm2014-06-161-2/+2
| | * | | | | | Deprecate configurations and use allowed_tags and allowed_attributes on White...Timm2014-06-161-99/+22
| | * | | | | | Remove include of rails-dom-testing in rails_info_controller_test.rb as it is...Timm2014-06-161-3/+0
| | * | | | | | Migrated test away from escaped quotes.Timm2014-06-161-1/+1