aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Fix ActiveSupport integration with Mocha > 0.12.1Mike Gunderloy2012-08-021-1/+3
* | Merge pull request #7299 from iHiD/3-2-stable-storeRafael Mendonça França2012-08-095-2/+22
|\ \
| * | Add CHANGELOG entryRafael Mendonça França2012-08-091-0/+5
| * | Backport #7173.Jeremy Walker2012-08-091-2/+4
| * | Ported PR #4856 to 3-2-stable.Jeremy Walker2012-08-094-2/+15
|/ /
* | Fix CHANGELOG [ci skip]Rafael Mendonça França2012-08-081-1/+4
* | Remove references to old behavior with headers atRafael Mendonça França2012-08-071-4/+3
* | Merge pull request #7284 from josh/fix-asset-testsRafael Mendonça França2012-08-071-3/+2
|\ \
| * | Fix invalid asset compile assertionsJoshua Peek2012-08-071-3/+2
|/ /
* | make assertions easier to track downAaron Patterson2012-08-071-9/+17
* | Merge pull request #7283 from josh/bump-sprocketsDavid Heinemeier Hansson2012-08-071-1/+1
|\ \
| * | Loosen sprockets version restrictionJoshua Peek2012-08-071-1/+1
|/ /
* | Add CHANGELOG entry for a935c7aRafael Mendonça França2012-08-061-0/+5
* | Merge pull request #5872 from evtuhovich/prepared_statement_fixAaron Patterson2012-08-061-10/+10
* | Merge pull request #7167 from route/missed_extendJosé Valim2012-08-061-0/+1
* | Merge pull request #7276 from sikachu/3-2-stable-js-include-tag-fixRafael Mendonça França2012-08-063-7/+19
|\ \
| * | Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
| * | Do not include application.js if it doesn't existsPrem Sichanugrist2012-08-063-5/+17
|/ /
* | Merge pull request #7140 from seamusabshere/patch-1Rafael Mendonça França2012-08-052-2/+10
* | Revert "Merge pull request #6084 from brainopia/support_for_magic_domain_on_a...Rafael Mendonça França2012-08-052-14/+0
* | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_storesJosé Valim2012-08-022-0/+14
* | More `:rails_env` cleanup.Rafael Mendonça França2012-08-021-6/+6
* | Fix html_escape with Ruby 1.8Rafael Mendonça França2012-08-021-15/+26
* | html_escape should escape single quotesSantiago Pastorino2012-08-0212-63/+51
* | Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` atRafael Mendonça França2012-08-022-4/+9
* | Do not consider the numeric attribute as changed if the old value isRafael Mendonça França2012-08-023-2/+21
* | Merge pull request #7232 from kennyj/fix_7200Carlos Antonio da Silva2012-08-022-1/+6
|\ \
| * | Backport #5168 to 3-2-stable. Fix a problem that NULLS is ignored by postgres...kennyj2012-08-022-1/+6
* | | Merge pull request #7235 from ffmike/mocha_12_2_compatCarlos Antonio da Silva2012-08-021-1/+3
|\| | | |/ |/|
| * Fix ActiveSupport integration with Mocha > 0.12.1Mike Gunderloy2012-08-021-1/+3
|/
* This entry is wrongSantiago Pastorino2012-08-011-2/+0
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-019-17/+17
* Revert "Deprecate link_to_function and button_to_function helpers"Rafael Mendonça França2012-08-013-28/+16
* Revert "Deprecate `:mouseover` options for `image_tag` helper."Rafael Mendonça França2012-08-013-42/+10
* Revert "Deprecate ActiveSupport::JSON::Variable"Rafael Mendonça França2012-08-013-23/+14
* Fix CHANGELOGSRafael Mendonça França2012-08-012-14/+38
* removes the deprecation of update_attributeXavier Noria2012-08-012-3/+2
* revises the deprecation warning of update_attributeXavier Noria2012-08-012-2/+2
* Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op...Rafael Mendonça França2012-08-018-188/+63
* Revert "Deprecating composed_of in ActiveRecord"Rafael Mendonça França2012-08-015-24/+7
* Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-018-97/+38
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-017-10/+41
* Merge pull request #7070 from jmazzi/3-2-stableRafael Mendonça França2012-08-011-3/+6
|\
| * Update documentation for Rails::Application#env_configJustin Mazzi2012-07-161-3/+6
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
* | Add CHANGELOG entry [ci skip]Rafael Mendonça França2012-07-311-0/+8
* | Revert "Add update_columns and the suggestion of using update_columnsRafael Mendonça França2012-07-304-78/+2
* | removes the AR session store from eager loaded code [fixes #7160]Xavier Noria2012-07-291-1/+10
* | Merge pull request #7187 from frodsan/fix_test_helpRafael Mendonça França2012-07-281-2/+2
|\ \
| * | Backport #6995 to 3-2 stableFrancesco Rodriguez2012-07-281-2/+2
|/ /