aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5633 from drogus/embed-auth-token-in-remote-formsSantiago Pastorino2012-03-285-14/+76
|\ | | | | Embed auth token in remote forms
| * Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-285-14/+76
|/ | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default)
* Merge pull request #5616 from cbartlett/migration-indentSantiago Pastorino2012-03-281-2/+2
| | | | Fix indenting in migration generator
* Merge pull request #5624 from rafaelfranca/fix-buildMichael Koziarski2012-03-271-1/+1
|\ | | | | Fix build
| * Add arel branch to the testsRafael Mendonça França2012-03-271-1/+1
|/
* Merge pull request #5622 from rafaelfranca/fix-2492-3-2Jeremy Kemper2012-03-272-2/+38
|\ | | | | [3-2-stable] Fix label_tag to merge the options hash with the object hash
| * Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-272-16/+24
| | | | | | | | | | | | hash. Closes #2492 and #5614
| * Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label.Andrey Samsonov2012-03-272-2/+30
| | | | | | | | | | | | objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
* | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
|\ \ | | | | | | Textarea newline fix breaks haml (3-2-stable)
| * | Don't break Haml with textarea newline fix.James Coleman2012-03-273-8/+12
| | | | | | | | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation.
* | | adding a branch to arelAaron Patterson2012-03-271-2/+2
| | |
* | | Merge pull request #5618 from lest/patch-1Piotr Sarnacki2012-03-272-0/+15
|\ \ \ | | | | | | | | force datetime attributes to be changed
| * | | force datetime attributes to be changedSergey Nartimov2012-03-272-0/+15
| | | | | | | | | | | | | | | | backport ddb5d2f756d9d2655a07791a3b62832efd588474 to 3-2-stable
* | | | Bumping to 3.2.3.rc1Santiago Pastorino2012-03-279-17/+17
| |_|/ |/| |
* | | Merge pull request #5603 from drogus/fix-rendered-format-for-render-partialJosé Valim2012-03-273-2/+22
|\ \ \ | | | | | | | | Fix rendered format for render partial
| * | | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-273-2/+22
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header.
* | | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
| | | | | | | | | | | | Issue with schema dump
* | | Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2José Valim2012-03-261-1/+1
|\ \ \ | |_|/ |/| | Fix build for branch 3-2-stable - return the same session hash object
| * | Return the same session data object when setting session idCarlos Antonio da Silva2012-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Make sure to return the same hash object instead of returning a new one. Returning a new one causes failures on cookie store tests, where it tests for the 'Set-Cookie' header with the session signature. This is due to the hash ordering changes on Ruby 1.8.7-p358.
* | | Merge pull request #5596 from lest/patch-3Piotr Sarnacki2012-03-262-1/+12
|\ \ \ | | |/ | |/| apply form_for namespace option to date_select
| * | apply form_for namespace option to date_selectSergey Nartimov2012-03-262-1/+12
|/ /
* / Fix 'Security#Mass Assignment' URL typoAbe Voelker2012-03-261-1/+1
|/
* chdir before globbing so that we don't need to escape directory names.Aaron Patterson2012-03-231-1/+30
| | | | fixes #5521
* Merge pull request #5537 from kennyj/fix_4399-32Aaron Patterson2012-03-232-6/+34
|\ | | | | [3-2-stable] migrate(:down) method with table_name_prefix
| * migrate(:down) method with table_name_prefixkennyj2012-03-212-6/+34
| |
* | Merge pull request #5558 from carlosantoniodasilva/fix-build-3-2Piotr Sarnacki2012-03-231-16/+16
|\ \ | | | | | | Fix build for branch 3-2-stable - Part 2
| * | Fix identity map testsCarlos Antonio da Silva2012-03-231-16/+16
|/ /
* | Merge pull request #5557 from carlosantoniodasilva/fix-build-3-2Aaron Patterson2012-03-2213-46/+45
|\ \ | | | | | | Fix build for branch 3-2-stable
| * | Add order to tests that rely on db ordering, to fix failing tests on pgCarlos Antonio da Silva2012-03-2213-46/+45
|/ / | | | | | | | | | | | | Also skip persistente tests related to UPDATE + ORDER BY for postgresql PostgreSQL does not support updates with order by, and these tests are failing randomly depending on the fixture loading order now.
* | Merge pull request #5525 from kennyj/fix_5411José Valim2012-03-222-1/+13
|\ \ | | | | | | Fix GH #5411. When precompiling, params method is undefined.
| * | Fix GH #5411. When precompiling, params method is undefined.kennyj2012-03-222-1/+13
| | |
* | | Merge pull request #5542 from mhfs/port_5522_to_32stablePiotr Sarnacki2012-03-212-0/+21
|\| | | | | | | | Port of #5522 'Fix adding/removing field's index when generating migration'
| * | [3-2-stable] Port of #5522 'Fix adding/removing field's index when ↵Marcelo Silveira2012-03-212-0/+21
|/ / | | | | | | generating migration'
* | Merge pull request #5533 from mhfs/migration_blank_line_3_2José Valim2012-03-212-1/+2
|\ \ | |/ |/| [3-2-stable] Remove blank line from generated migration
| * [3-2-stable] Remove blank line from generated migrationMarcelo Silveira2012-03-202-1/+2
|/
* We dont need to merge in the parameters as thats all being reset by the rack ↵David Heinemeier Hansson2012-03-201-1/+0
| | | | headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
* Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stableJosé Valim2012-03-182-9/+7
|\ | | | | Build fix 1.8.7 3 2 stable
| * Build fix for ruby1.8.7-358Arun Agrawal2012-03-192-9/+7
|/
* Increase minimum version of mail.Mikel Lindsaar2012-03-191-1/+1
| | | | | Second security vulnerability found in mail file delivery method patched in version 2.4.4.
* Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-2-stableJosé Valim2012-03-181-1/+1
|\ | | | | Build fix app generator test 3 2 stable
| * Build fix for app_generator_test.rbArun Agrawal2012-03-181-1/+1
|/
* Merge pull request #5493 from kennyj/fix_5435-32Piotr Sarnacki2012-03-182-0/+13
|\ | | | | [3-2-stable] Fix GH #5435. db:structure:dump should be re-enable.
| * Fix GH #5435. db:structure:dump should be re-enable.kennyj2012-03-182-0/+13
|/
* Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform onlyPiotr Sarnacki2012-03-171-1/+1
|
* Ensure load hooks can be called more than once with different contexts.José Valim2012-03-172-6/+35
|
* Merge pull request #5480 from drogus/rendering-issuesJosé Valim2012-03-178-0/+46
|\ | | | | Fix for #5440
| * Add missing test for #5308Piotr Sarnacki2012-03-173-0/+15
| |
| * Fix #5440 - multiple render_to_string breaks partials formatsPiotr Sarnacki2012-03-176-0/+31
|/ | | | | | | | | This fixes situation where rendering template to string sets `rendered_format` to the format rendered there. This is ok to have consistent formats rendered in partials, but it breaks on next renders if format is explicitly set or on last render where default format does not necessarily need to be the format of first rendered template.
* Merge pull request #5457 from brianmario/typo-fixAaron Patterson2012-03-151-1/+1
| | | | Fix typo in redirect test
* Merge pull request #5456 from brianmario/redirect-sanitizationAaron Patterson2012-03-153-2/+22
| | | | Strip null bytes from Location header
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:15:30 +0000