aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move ActionController::RecordIdentifier to ActionViewPiotr Sarnacki2012-08-287-11/+6
| | | | | | | Since it's more about DOM classes and ids it belongs to Action View better. What's more, it's more convenient to make it part of Action View to follow the rule that Action Pack can depend on Action View, but not the other way round.
* Remove dependency on actionpack in ActionView::AssetPathsPiotr Sarnacki2012-08-284-6/+20
| | | | | | Since Action View should not depend on actionpack, it's best to delegate invalid_asset_host! to controller and just rely on such simple contract instead of raising ActionController::RoutingError directly.
* Merge pull request #7460 from frodsan/fix_nested_attributes_testRafael Mendonça França2012-08-271-7/+9
|\ | | | | ensures that the test repairs the validation setup
| * ensures that the test repairs the validation setupFrancesco Rodriguez2012-08-271-7/+9
|/
* Merge pull request #7451 from frodsan/fix_dep_agSantiago Pastorino2012-08-271-0/+2
|\ | | | | fix order dependent test in AggregationsTest
| * fix order dependent test in AggregationsTestFrancesco Rodriguez2012-08-261-0/+2
|/ | | | | | | | | | | | | | Ensure class variable is set to nil. It prevents the following test to fail: def test_do_not_run_the_converter_when_nil_was_set customers(:david).non_blank_gps_location = nil assert_nil Customer.gps_conversion_was_run end Check https://github.com/rails/rails/blob/master/activerecord/test/models/customer.rb#L7 for more information.
* Remove unused variableRafael Mendonça França2012-08-261-1/+1
|
* Add test to ensure that save will raise SerializationTypeMismatch if theRafael Mendonça França2012-08-261-0/+6
| | | | serialized attribute value is not from the same class
* We don't need this reloadRafael Mendonça França2012-08-261-1/+1
|
* Use the Topic class in the attribute serialized testsRafael Mendonça França2012-08-261-8/+4
|
* Use teardown hook to return the initial state of the objectRafael Mendonça França2012-08-261-16/+5
|
* Move the serialized attribute tests to their own fileRafael Mendonça França2012-08-263-207/+214
|
* Move test to the correct fileRafael Mendonça França2012-08-263-12/+12
|
* Remove some entries from the 4.0 release notesRafael Mendonça França2012-08-261-25/+0
| | | | We need more :heart: in this file. There are a lot of outdated entries.
* Remove CHANGELOG entry for the update_attribute removal.Rafael Mendonça França2012-08-261-6/+0
| | | | We reverted the removal because the new deprecation policy
* Use verify_readonly_attribute in the update_columns methodRafael Mendonça França2012-08-251-1/+1
|
* Revert "Remove private verify readonly attr method"Rafael Mendonça França2012-08-251-1/+5
| | | | This reverts commit 7a8aee08b610f6edbfe5be076dc14e5cdcf1355e.
* Revert "Remove update_attribute."Rafael Mendonça França2012-08-254-7/+71
| | | | | | | | | | | This reverts commit a7f4b0a1231bf3c65db2ad4066da78c3da5ffb01. Conflicts: activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/persistence.rb activerecord/test/cases/base_test.rb activerecord/test/cases/dirty_test.rb activerecord/test/cases/timestamp_test.rb
* Merge pull request #7029 from panthomakos/date-and-timeRafael Mendonça França2012-08-257-848/+433
|\ | | | | Refactored common date and time calculations.
| * Refactored common date and time calculations.Pan Thomakos2012-08-047-848/+433
| | | | | | | | | | | | | | | | * Added the `DateAndTime::Calculations` module that is included in Time and Date. It houses common calculations to reduce duplicated code. * Simplified and cleaned-up the calculation code. * Removed duplication in tests by adding a behavior module for shared tests. I also added some missing tests.
* | Merge pull request #7449 from Mik-die/nested-limitsRafael Mendonça França2012-08-254-11/+49
|\ \ | | | | | | Allow to pass Symbol or Proc into :limit option of #accepts_nested_attributes_for
| * | changelog #7449Mikhail Dieterle2012-08-261-0/+4
| | |
| * | allow to pass Symbol or Proc into :limit option of ↵Mikhail Dieterle2012-08-263-11/+45
| | | | | | | | | | | | #accepts_nested_attributes_for
* | | Create variable only in the test that uses itCarlos Antonio da Silva2012-08-251-3/+3
|/ / | | | | | | | | Instead of building a Blog::Post instance for every test in form helper tests, just build it in the test that uses it.
* | Merge pull request #7435 from nashby/fix-issue-7431Rafael Mendonça França2012-08-253-2/+34
|\ \ | | | | | | correct handling of date selects when using both disabled and discard options
| * | correct handling of date selects when using both disabled and discard optionsVasiliy Ermolovich2012-08-253-2/+34
|/ / | | | | | | | | | | | | | | | | | | | | | | we should take disabled option not only from `html_options` hash but from `options` hash too like `build_select` method does it. So datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true }) datetime_select("post", "updated_at", :discard_minute => true , :disabled => true) both these variants work now closes #7431
* | simplifies yet another regexpXavier Noria2012-08-251-1/+1
| |
* | instead of returning $& if =~ succeeds, use String#[]Xavier Noria2012-08-251-1/+1
| |
* | simplifies a regexpXavier Noria2012-08-251-1/+1
| | | | | | | | | | | | | | | | We simplify two things here: First since * is greedy it is enough to go look for the rightmost ::, no need to ask the regexp engine to match the rest of the string since we are not validating anything, only capturing. The second simplification comes from using a look-ahead assertion, that allows us to have the capture in $&, thus removing the need of a group.
* | use Hash#fetch to eliminate conditionalAaron Patterson2012-08-241-8/+3
| |
* | call methods on AR::Model after ClassMethods module is definedAaron Patterson2012-08-241-1/+2
| |
* | Merge pull request #7342 from sobrinho/masterRafael Mendonça França2012-08-246-5/+64
|\ \ | | | | | | Accept a symbol for `:in` option on inclusion and exclusion validators
| * | Accept a symbol for `:in` option on inclusion and exclusion validatorsGabriel Sobrinho2012-08-246-5/+64
| | |
* | | Merge pull request #7436 from sikachu/master-remove-active_record-session_storeJosé Valim2012-08-2425-976/+41
|\ \ \ | |/ / |/| | Extract ActiveRecord::SessionStore from Rails
| * | Raise more helpful error message on missing gemPrem Sichanugrist2012-08-242-0/+26
| | | | | | | | | | | | | | | | | | Tell people to install `activerecord-session_store` gem when it's not installed instead ofraising `NameError` on missing `ActionDispatch::Session::ActiveRecordStore`.
| * | Remove meta Sesion Migration generatorPrem Sichanugrist2012-08-242-16/+0
| | |
| * | Update guide/release note about AR::SessionStorePrem Sichanugrist2012-08-244-14/+6
| | |
| * | Extract ActiveRecord::SessionStore from RailsPrem Sichanugrist2012-08-2418-947/+10
|/ / | | | | | | | | This functionality will be available from gem `active_record-session_store` instead.
* | Merge pull request #7058 from frodsan/fix_as_random_testsRafael Mendonça França2012-08-246-25/+36
|\ \ | | | | | | Fix tests that depend on run order
| * | Fix ActionMailer tests that depend on run orderFrancesco Rodriguez2012-08-231-5/+9
| | |
| * | Fix ActiveModel tests that depend on run orderFrancesco Rodriguez2012-08-231-6/+4
| | |
| * | Fix ActiveSupport tests that depend on run orderFrancesco Rodriguez2012-08-234-14/+23
| | |
* | | simplifies a regexpXavier Noria2012-08-241-1/+1
| | | | | | | | | | | | | | | The new regexp has less work to do, we anchor a fixed string at the end and need no group.
* | | ivar will always be defined, so stop checkingAaron Patterson2012-08-231-3/+1
| | |
* | | mysql does not build on Ruby 2.0.0 at the momentAaron Patterson2012-08-231-1/+1
|/ /
* | Merge pull request #7434 from frodsan/select_list_argumentsAaron Patterson2012-08-232-11/+20
|\ \ | | | | | | Model.select takes a variable list of arguments
| * | Model.select takes a variable list of arguments.Isaac Sanders2012-08-232-11/+20
|/ / | | | | | | | | | | This is a cleaner version of #6916. Closes #3165.
* | Merge pull request #7061 from davidcelis/masterVijay Dev2012-08-231-1/+3
|\ \ | | | | | | Update the documentation for the :autosave option on belongs_to
| * | Update the documentation for the :autosave optionDavid Celis2012-08-231-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | I've noticed a caveat with the :autosave option biting people before. Questions arise about why they must explicitly save an associated object in their own before_save callbacks. I've updated the documentation as such to note to users that the :autosave callback occurs before any user defined callbacks. They must save the associated record themselves if altering it in their own callbacks. Signed-off-by: David Celis <david@davidcelis.com>
* | Revert "Use join without default separator"José Valim2012-08-232-2/+7
| | | | | | | | | | | | This reverts commit b0ab8dc0b2b0f580ffe5ac9ff57fd13152e18577 because it was removing the contents of the message when we did not have any tag. A test case is also committed.