aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * More fixes for action pack tests with Dalli.Arun Agrawal2012-08-271-3/+3
| |
| * Let's run action pack tests with DalliArun Agrawal2012-08-271-4/+4
| | | | | | There is no memcache gem left in repo.
* | Merge pull request #7465 from wpp/generator_controller_pluralJosé Valim2012-08-281-6/+6
|\ \ | | | | | | Change generators controller help from singular to plural example.
| * | Change generators controller help from singular to plural example.Philipp Weissensteiner2012-08-281-6/+6
|/ / | | | | | | | | | | | | When running `rails generate controller --help` an example with creating a (singular) "CreditCard" controller is shown. The convention is to generate controllers with plural names though.
* | Merge pull request #7458 from frodsan/fix_orddep_basicsRafael Mendonça França2012-08-281-5/+5
|\ \ | | | | | | fix order dependent test in AR::BasicsTest
| * | fix order dependent test in AR::BasicsTestFrancesco Rodriguez2012-08-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This test https://github.com/rails/rails/blob/master/activerecord/test/cases/base_test.rb#L381 is failing because is not setting `CreditCard.pluralize_table_name` to `false`. In this case, i prefer to change to another model that is not in the `GUESSED_CLASSES` array.
* | | Merge branch 'actionview-decoupling'Piotr Sarnacki2012-08-2849-232/+487
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | This branch contains set of changes that will allow to extract Action View out of Action Pack in the future. This work will be probably done after Rails 4.0 release, because of a few deprecations that were done to make decoupling possible.
| * | | Update AP's CHANGELOG with user facing changesPiotr Sarnacki2012-08-281-0/+14
| | | |
| * | | Deprecate AV::RecordIdentifier in controllersPiotr Sarnacki2012-08-283-4/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods provided by RecordIdentifier are not widely used in controllers nowadays as they're view specific (this is probably a legacy left after RJS rendering directly in controllers). However if people still need to use it, it's trivial to include ActionView::RecordIdentifier by themselves.
| * | | Fix ActionView::RecordIdentifier to work as a singletonPiotr Sarnacki2012-08-282-0/+10
| | | | | | | | | | | | | | | | | | | | We extend it with self, but the methods were not working properly were used directly on module.
| * | | No need to use included hook for includePiotr Sarnacki2012-08-281-3/+1
| | | | | | | | | | | | | | | | | | | | When module is extended ActiveSupport::Concern, include calls are lazily loaded, so there is no need to wrap it with included hook.
| * | | Deprecate Template#mime_typePiotr Sarnacki2012-08-282-0/+13
| | | |
| * | | Add deprecation horizon to html-scannerPiotr Sarnacki2012-08-281-1/+2
| | | |
| * | | Implement ActionView::Template::TypesPiotr Sarnacki2012-08-285-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | AV::Template::Types is a small abstraction to allow to specify template types that can be used in ActionView. When Action Pack is loaded it's replaced with Mime::Type.
| * | | Don't require action_dispatch in ActionView::UrlHelpersPiotr Sarnacki2012-08-288-100/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Routing::UrlFor was always required in UrlHelpers. This was changed by splitting previous implementation of UrlHelper into 2 modules: ActionView::Helpers::UrlHelper and ActionView::Routing::UrlHelper. The former one keeps only basic implementation of url_for. The latter adds features that allow to use routes and is only required when url_helpers or mounted_helpers are required.
| * | | Use ActionView::Base.logger instead of AC::Base.loggerPiotr Sarnacki2012-08-282-2/+2
| | | |
| * | | Add ActionView::Base.default_formatsPiotr Sarnacki2012-08-284-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default_formats array is used by LookupContext in order to allow rendering templates when :formats option is not passed. Previously it was always set to Mime::SET, which created dependency on Action Pack. In order to remove this dependency, Mime::SET is used only if ActionController is loaded.
| * | | Remove Mime::Type translations from Action ViewPiotr Sarnacki2012-08-284-11/+10
| | | | | | | | | | | | | | | | | | | | Action View should not be responsible for translating mime types. Any translation that's needed should be handled at controller level.
| * | | Deprecate mime types lookup in auto_discovery_link_tagPiotr Sarnacki2012-08-282-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Automatically handling mime types for things other than :rss and :atom is not functionality that justifies dependency on Mime::Type from actionpack.
| * | | Remove comment about getting rid of old AV::Base.new behaviorPiotr Sarnacki2012-08-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've talked to José Valim, who added this comment, and there is no need to remove old API. It's good to have a simple way to instantiate ActionView::Base, by just passing view paths as a first argument, instead of constructing LookupContext and then the Renderer. [ci skip]
| * | | Remove stubs from LogSubscriber testsPiotr Sarnacki2012-08-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can use another way to instantiate ActionView::Base, by passing renderer as a first option. Thanks to that we can just pass prefixes to LookupContext instead stubbing them on the controller. This is also good, because that kind of API is used in Rails code.
| * | | Move action_controller/vendor/html-scanner to action_viewPiotr Sarnacki2012-08-2816-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | This is another step in moving Action View's dependencies in Action Pack to Action View itself. Also, HtmlScanner seems to be better suited for views rather than controllers.
| * | | Deprecate ActionController::RecordIdentifierPiotr Sarnacki2012-08-282-0/+12
| | | |
| * | | Add ActionView::ModelNamingPiotr Sarnacki2012-08-283-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It's just a duplicate of ActionController::ModelNaming. These are just a simple helpers for decoupling Active Model, so it does not make sense to extract it to Active Support, but the point is to decouple also Action View and Action Pack
| * | | 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