aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* test initializer logic for DATABASE_URL env varTerence Lee2012-04-031-0/+43
|
* DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
|
* Usage file in generators shouldn't be fetched only based on source_rootPiotr Sarnacki2012-04-023-5/+22
| | | | | | | | In case `source_roout` is not set, `default_source_root` is used, which includes also `templates` directory. If there is no `templates` directory, `default_source_root` is not available and USAGE will not be displayed. USAGE should be also checked based on default directory excluding `templates`.
* Fix the redirect when it receive blocks with arity of 1.Rafael Mendonça França2012-03-312-1/+17
| | | | Closes #5677
* Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_selectAaron Patterson2012-03-303-21/+29
|\ | | | | Fixing Identity Map when using find select in rails 3.2
| * refactor instantiate method in base, so we remove nesting if's which make ↵Arturo Pie2012-03-292-12/+19
| | | | | | | | | | | | | | | | the code harder to read. Minor changes to contain_all_columns in IdentityMap. Conflicts: activerecord/lib/active_record/base.rb
| * refactor the checking of the attributes of the record in IdentityMap#add, so ↵Arturo Pie2012-03-292-5/+12
| | | | | | | | it's more readable
| * Do not add record to identity map if the record doesn't have values for all ↵Arturo Pie2012-03-291-1/+1
| | | | | | | | the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
| * Adds a test that breaks IM when using #selectArturo Pie2012-03-291-12/+6
| |
* | Merge branch '3-2-3' into 3-2-stableSantiago Pastorino2012-03-3010-9/+13
|\ \
| * | Bump up to 3.2.3Santiago Pastorino2012-03-309-9/+9
| | |
| * | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| | |
| * | Bumping to 3.2.3.rc2Santiago Pastorino2012-03-299-9/+9
| | |
| * | Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| | |
| * | Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| | |
| * | fix incorrect url in the deprecation message for vendor/plugins [ci skip]Vijay Dev2012-03-291-1/+1
| | |
| * | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
| | | | | | | | | | | | Closes #5632
| * | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
| | | | | | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
| * | Merge pull request #5633 from drogus/embed-auth-token-in-remote-formsSantiago Pastorino2012-03-285-14/+76
| | | | | | | | | | | | Embed auth token in remote forms
| * | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
| | | | | | | | | | | | Textarea newline fix breaks haml (3-2-stable)
* | | Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-303-2/+20
| | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/eager_test.rb
* | | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| |/ |/|
* | fix incorrect url in the deprecation message for vendor/plugins [ci skip]Vijay Dev2012-03-291-1/+1
| |
* | Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2Santiago Pastorino2012-03-281-1/+1
|\ \ | | | | | | Changed the config.assets.manifest to nil
| * | Changed the config.assets.manifest to nil in the comments in the production ↵Anuj Dutta2012-03-281-1/+1
|/ / | | | | | | config template.
* | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
| | | | | | | | Closes #5632
* | Merge pull request #5640 from yahonda/address_ora_00918_with_oracleSantiago Pastorino2012-03-281-1/+1
|\ \ | | | | | | Address an error for test_has_many_through_polymorphic_has_one with Oracle
| * | Change the order argument from ('id') to ('taggings.id')Yasuo Honda2012-03-281-1/+1
| |/ | | | | | | to address ORA-00918 error
* | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
| | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
* | Fix #5549.Jon Leighton2012-03-282-3/+7
| |
* | Test for #5549.Aaron Patterson2012-03-282-1/+16
| | | | | | | | | | | | | | | | Cherry-picked from e96d04a2e4e244ea5053cb4e8ab97db604d0c796. Conflicts: activerecord/lib/active_record/attribute_methods/read.rb
* | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:37:05 +0000