aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Make File#atomic_write tests pass with umaskThibault Jouan2012-05-291-3/+3
* | | | Merge pull request #6555 from schneems/schneems/remove-reload-codeRafael Mendonça França2012-05-301-2/+0
|\ \ \ \
| * | | | remove unused route reloading codeschneems2012-05-301-2/+0
|/ / / /
* | | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-304-5/+15
|\ \ \ \
| * | | | Fix #5797. Error calling dup method on AR model with serialized fieldkennyj2012-05-304-5/+15
* | | | | Merge pull request #6386 from kennyj/fix_logs_name_consistencyAaron Patterson2012-05-307-33/+123
|\ \ \ \ \
| * | | | | Fix logs name consistency.kennyj2012-05-197-33/+123
* | | | | | cut down spaces [ci skip]Vijay Dev2012-05-301-3/+3
* | | | | | Revert "Revert "[AR querying guide] Add examples for take(limit), first(limit...Vijay Dev2012-05-301-0/+48
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-3019-208/+328
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | copy edit the batches docs [ci skip]Vijay Dev2012-05-301-9/+7
| * | | | | let's not add too much details upfront in the introduction [ci skip]Vijay Dev2012-05-301-8/+1
| * | | | | Revert "[AR querying guide] Add examples for take(limit), first(limit) and la...Vijay Dev2012-05-301-48/+0
| * | | | | some copy edits [ci skip]Vijay Dev2012-05-301-4/+4
| * | | | | fix typo in render_template [ci skip]Brent Vatne2012-05-291-1/+1
| * | | | | Revert my own commit, didnt notice that this was intentional. [ci skip]Saulius Grigaliunas2012-05-291-1/+1
| * | | | | Routing guide: route constraints are anchored by default, remove ^ character....Saulius Grigaliunas2012-05-291-1/+1
| * | | | | fix typo on ActiveSupport instrumentation guide [ci skip]Rafael Magana2012-05-291-1/+1
| * | | | | fix example format and add markup in Module#mattr_accessor documentation [ci ...Francesco Rodriguez2012-05-291-10/+10
| * | | | | fix typos on migrations guide [ci skip]Francesco Rodriguez2012-05-281-4/+4
| * | | | | [contributing guide] add instructions to update fork [ci skip]Rafael Magana2012-05-281-0/+36