aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Do not mutate options hashCarlos Antonio da Silva2012-04-272-2/+8
* fix number_to_human docs [ci skip]Vijay Dev2012-04-261-2/+2
* Fix broken test from the earlier merge conflictPrem Sichanugrist2012-04-231-9/+11
* Merge pull request #5866 from tiegz/minor_fixes_3-2-stableAaron Patterson2012-04-232-42/+27
|\
| * converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-162-47/+23
| * catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-162-1/+10
* | Updated other README to point 3-2-stableArun Agrawal2012-04-231-1/+1
|/
* default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-082-2/+2
* Fix the redirect when it receive blocks with arity of 1.Rafael Mendonça França2012-03-312-1/+17
* Merge branch '3-2-3' into 3-2-stableSantiago Pastorino2012-03-302-1/+5
|\
| * Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
| * Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| * Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
| * Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| * Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| * Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
| * Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
| * Merge pull request #5633 from drogus/embed-auth-token-in-remote-formsSantiago Pastorino2012-03-284-14/+74
| * Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
* | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
* | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
* | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
* | Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-284-14/+74
* | Merge pull request #5622 from rafaelfranca/fix-2492-3-2Jeremy Kemper2012-03-272-2/+38
|\ \
| * | Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-272-16/+24
| * | Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label.Andrey Samsonov2012-03-272-2/+30
* | | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
|\ \ \ | |_|/ |/| |
| * | Don't break Haml with textarea newline fix.James Coleman2012-03-273-8/+12
* | | Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
| |/ |/|
* | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-273-2/+22
* | Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2José Valim2012-03-261-1/+1
|\ \ | |/ |/|
| * Return the same session data object when setting session idCarlos Antonio da Silva2012-03-241-1/+1
* | apply form_for namespace option to date_selectSergey Nartimov2012-03-262-1/+12
|/
* Fix GH #5411. When precompiling, params method is undefined.kennyj2012-03-221-1/+1
* We dont need to merge in the parameters as thats all being reset by the rack ...David Heinemeier Hansson2012-03-201-1/+0
* Build fix for ruby1.8.7-358Arun Agrawal2012-03-192-9/+7
* Add missing test for #5308Piotr Sarnacki2012-03-173-0/+15
* Fix #5440 - multiple render_to_string breaks partials formatsPiotr Sarnacki2012-03-176-0/+31
* Merge pull request #5457 from brianmario/typo-fixAaron Patterson2012-03-151-1/+1
* Merge pull request #5456 from brianmario/redirect-sanitizationAaron Patterson2012-03-153-2/+22
* Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequenceAaron Patterson2012-03-152-0/+5
|\
| * fix ArgumentError being raised in case of invalid byte sequencesMichael Reinsch2012-03-082-0/+5
* | Remove ActionController::TestCase#rescue_action_in_public!Piotr Sarnacki2012-03-152-10/+0
* | Allow you to force the authenticity_token to be rendered even on remote forms...David Heinemeier Hansson2012-03-142-5/+20
* | Do not include the authenticity token in forms where remote: true as ajax for...David Heinemeier Hansson2012-03-143-2/+22
* | Fix layout method doc formattingAlexey Vakhov2012-03-131-2/+1
* | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-3/+4
* | changelog updates [ci skip]Vijay Dev2012-03-091-0/+11
|/
* Remove usage of deprecated module.José Valim2012-03-071-1/+0
* Add test case for #5307Carlos Antonio da Silva2012-03-071-2/+6