aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Revert some ActiveSupport::Callbacks changes.Rafael Mendonça França2012-06-011-3/+16
* | Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-014-1/+24
* | minor comment revisionXavier Noria2012-06-011-1/+1
* | Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-012-2/+34
* | Sync CHANGLOG with the 3-2-stable branchRafael Mendonça França2012-06-015-4/+91
* | Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-014-3/+27
* | Merge pull request #6586 from amatsuda/generator_blank_lineRafael Mendonça França2012-06-012-2/+2
|\ \
| * | remove unneeded blank line from !namespeced? controller generatorsAkira Matsuda2012-06-012-2/+2
|/ /
* | Merge pull request #6583 from amatsuda/rake_dsl_19Piotr Sarnacki2012-06-011-1/+1
|\ \
| * | Revert "Only include Rake::DSL if it's defined."Akira Matsuda2012-06-011-1/+1
* | | Merge pull request #6584 from amatsuda/ar_explain_inspect_readabilityXavier Noria2012-06-011-1/+7
|\ \ \
| * | | improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
|/ / /
* | | Merge pull request #6579 from amatsuda/null_relation_modulizeJosé Valim2012-05-313-11/+15
|\ \ \ | |/ / |/| |
| * | unused method argumentsAkira Matsuda2012-06-011-7/+6
| * | modulize AR::NullRelationAkira Matsuda2012-06-013-4/+9
|/ /
* | Rake::DSL should always be availableJeremy Kemper2012-05-311-1/+1
* | Merge branch 'master-sec'Aaron Patterson2012-05-315-4/+65
|\ \
| * | Strip [nil] from parameters hash.Aaron Patterson2012-05-302-1/+28
| * | predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-303-3/+37
* | | Explicitly require rake so its DSL is availableJeremy Kemper2012-05-311-0/+1
* | | Rake is in 1.9 stdlib, no need for gem depJeremy Kemper2012-05-311-4/+2
* | | Psych is always available on 1.9Jeremy Kemper2012-05-312-29/+23
* | | Merge pull request #6571 from jeremyf/extract-force-ssl-filter-logic-to-separ...Rafael Mendonça França2012-05-313-7/+50
|\ \ \
| * | | Extracted redirect logic from ActionController::Force::ClassMethods.force_sslJeremy Friesen2012-05-313-7/+50
* | | | Reduce warning messages when running Active Support testsAndrew White2012-05-312-2/+8
* | | | Merge pull request #6566 from arunagw/add-javascripts-to-rake-stats-taskRafael Mendonça França2012-05-312-2/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Add code statistics for Javascript andArun Agrawal2012-05-312-2/+10
* | | | Fix changelog example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
* | | | Fix wrong example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
* | | | Simplify link_to using content_tagCarlos Antonio da Silva2012-05-312-12/+26
* | | | Make link_to arguments explicitCarlos Antonio da Silva2012-05-311-8/+4
* | | | Make button_to arguments explicit and refactor a bitCarlos Antonio da Silva2012-05-311-10/+6
* | | | Simplify logic to initialize valid conditions in RouteSetCarlos Antonio da Silva2012-05-311-7/+3
|/ / /
* | | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-05-311-0/+1
* | | Fix backward compatibility with stored Hash values. Wrap coders to convert se...Jeremy Kemper2012-05-303-15/+51
* | | Set RACK_ENV to nil in the dbconsole testRafael Mendonça França2012-05-301-0/+1
* | | Fix app_generator_test with the changes introduced atRafael Mendonça França2012-05-301-1/+1
* | | Merge pull request #6560 from martinoconnor/generator_fixRafael Mendonça França2012-05-301-1/+1
|\ \ \
| * | | Changed symbol platform to platforms for the commented out call to gem 'theru...Martin O'Connor2012-05-301-1/+1
|/ / /
* | | Merge pull request #6276 from samoli/fix_console_argumentsRafael Mendonça França2012-05-307-132/+182
|\ \ \
| * | | Remove support for rails server RAILS_ENV=env-nameSam Oliver2012-05-302-7/+2
| * | | Fix various bugs with console arguments.Sam Oliver2012-05-305-125/+180
|/ / /
* | | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
|\ \ \
| * | | Properly discover a connection is closed in postgresql_adapterSteve Klabnik2012-05-241-1/+2
* | | | Merge pull request #6556 from lest/patch-1Rafael Mendonça França2012-05-304-5/+53
|\ \ \ \
| * | | | accept a block in button_to helperSergey Nartimov2012-05-303-3/+51
| * | | | no need to pass an empty block to button_to helperSergey Nartimov2012-05-301-2/+2
* | | | | Merge pull request #6554 from erichmenge/remove-json-variablePiotr Sarnacki2012-05-304-14/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove deprecated ActiveSupport::JSON::Variable.Erich Menge2012-05-304-14/+7
* | | | | Merge pull request #6541 from tjouan/tj/activesupport-fix-tests-requiring-uns...Rafael Mendonça França2012-05-301-3/+3
|\ \ \ \ \