aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move require to where it's neededSantiago Pastorino2012-05-116-3/+6
|
* Remove ruby/shimSantiago Pastorino2012-05-113-17/+1
| | | | require 'action_view' is now much faster
* this stuff can all be handled by RelationJon Leighton2012-05-111-38/+0
|
* extract deprecated codeJon Leighton2012-05-111-8/+1
|
* set_owner_attributes is covered by the scopingJon Leighton2012-05-111-4/+3
|
* CollectionProxy < RelationJon Leighton2012-05-1111-60/+79
| | | | | | | | | | | | | | | | | | | | | This helps bring the interfaces of CollectionProxy and Relation closer together, and reduces the delegation backflips we need to perform. For example, first_or_create is defined thus: class ActiveRecord::Relation def first_or_create(...) first || create(...) end end If CollectionProxy < Relation, then post.comments.first_or_create will hit the association's #create method which will actually add the new record to the association, just as post.comments.create would. With the previous delegation, post.comments.first_or_create expands to post.comments.scoped.first_or_create, where post.comments.scoped has no knowledge of the association.
* Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect ↵Jon Leighton2012-05-114-3/+40
| | | | collection-thing.
* Merge pull request #6269 from edtsech/hash-except-testXavier Noria2012-05-111-0/+6
|\ | | | | Add test Hash#except can receive more than one argument.
| * Test Hash#except can receive more than one argument.Edward Tsech2012-05-111-0/+6
| |
* | Merge pull request #6268 from carlesso/masterJosé Valim2012-05-112-2/+2
|\ \ | |/ |/| In robots.txt User-agent should be all downcase except for the first 'U'
| * In robots.txt, User-agent should be all downcase except for the first 'U', ↵Enrico Carlesso2012-05-112-2/+2
|/ | | | according with http://en.wikipedia.org/wiki/Robots_exclusion_standard
* Copy literal route constraints to defaults - fixes #3571 and #6224.Andrew White2012-05-114-3/+69
|
* Fixes issue #6251David Padilla2012-05-101-1/+1
| | | | | | | Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy.
* Failing test for #6251Piotr Sarnacki2012-05-101-0/+7
|
* Return false for exists? with new records - fixes #6199.Andrew White2012-05-103-2/+3
|
* Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-102-1/+36
|
* Refactor the handling of default_url_options in integration testsAndrew White2012-05-102-7/+104
| | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly
* remove unnecessary 'examples' noise [ci skip]Vijay Dev2012-05-112-28/+18
|
* Merge pull request #6253 from rafmagana/masterJosé Valim2012-05-101-1/+1
|\ | | | | remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_action
| * remove duplicate usage of Rack::Utils.status_code in ↵Rafael Magana2012-05-101-1/+1
| | | | | | | | LogSubscriber#process_action
* | Merge pull request #6252 from grosser/unless_exist_for_memory_storeJosé Valim2012-05-102-0/+8
|\ \ | |/ |/| add unless_exist option to memory store
| * add unless_exist option to memory storegrosser2012-05-102-0/+8
|/
* Merge pull request #6244 from frodsan/fix_build_remove_keyJosé Valim2012-05-101-1/+1
|\ | | | | Remove key argument from run_callbacks to fix build
| * Remove key argument from run_callbacks to fix buildFrancesco Rodriguez2012-05-101-1/+1
|/
* Merge pull request #6242 from frodsan/fix_abstract_controllerJosé Valim2012-05-101-1/+1
|\ | | | | Removing key argument from run_callbacks method in abstract_controller
| * removing key argument from run_callbacks - fix buildFrancesco Rodriguez2012-05-101-1/+1
|/
* Merge pull request #6241 from frodsan/deprecate_key_callbacksJosé Valim2012-05-104-6/+7
|\ | | | | AS::Callbacks#run_callbacks remove key argument
| * AS::Callbacks#run_callbacks remove key argumentFrancesco Rodriguez2012-05-104-6/+7
|/
* Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rbJeremy Kemper2012-05-092-81/+82
|\ | | | | Rename variables and remove unused code in fixtures.rb
| * Rename some variablesAlexey Muranov2012-05-092-78/+82
| | | | | | | | | | | | Rename some parameters and instance and local variables, mostly in fixtures.rb. Also remove an unused assignment to an instance variable. There are minor code changes.
| * Remove unused private method in fixtures.rbAlexey Muranov2012-05-091-3/+0
| | | | | | | | Remove the unused private method ActiveRecord::Fixtures#yaml_fixtures_key(path).
| * Remove unused parameter in ::instantiate_fixturesAlexey Muranov2012-05-091-5/+5
| | | | | | | | Second parameter of Fixtures::instantiate_fixtures was not used, so i removed it.
* | Allow to run `connection_adapters/quoting_test.rb` independentlyPiotr Sarnacki2012-05-091-1/+3
| |
* | Merge pull request #5362 from zenprogrammer/quoting_bugAaron Patterson2012-05-092-0/+12
|\ \ | | | | | | Fixed bug in ActiveRecord that caused classes to be quoted incorrectly
| * | Fixed bug in Quoting that caused classes to be quoted incorrectlyRyan Oblak2012-03-092-0/+12
| | |
* | | Merge pull request #6226 from gnufied/masterAaron Patterson2012-05-092-6/+33
|\ \ \ | | | | | | | | Update tranasaction state when record gets commited
| * | | make both cached and record_updated accessors in one lineHemant Kumar2012-05-091-2/+1
| | | |
| * | | after_commit :on => :update should be called when save isHemant Kumar2012-05-091-0/+7
| | | | | | | | | | | | | | | | called from after_commit callback
| * | | Fix transaction state not changing when after record gets commitedHemant Kumar2012-05-092-6/+27
| | | |
* | | | Merge pull request #6227 from mjtko/changelog-fixesVijay Dev2012-05-091-22/+33
|\ \ \ \ | |/ / / |/| | | Updated activesupport CHANGELOG
| * | | Consistent CHANGELOG entry indentation.Mark J. Titorenko2012-05-091-22/+22
| | | |
| * | | Add CHANGELOG section for unreleased Rails 3.2.4; document addition of ↵Mark J. Titorenko2012-05-091-0/+11
|/ / / | | | | | | | | | #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.
* | | Refactor Generator class to not rely on in-place editing the controllerAndrew White2012-05-092-11/+16
| | |
* | | Fix bug when url_for changes controller.Nikita Beloglazov2012-05-092-2/+11
| |/ |/|
* | fix a couple of formatting issues [ci skip]Vijay Dev2012-05-091-2/+4
| |
* | registers ceb1dcc in the CHANGELOGXavier Noria2012-05-091-0/+2
| |
* | update some examples in asset tag helper docs [ci skip]Vijay Dev2012-05-091-15/+15
| |
* | remove redundant and stray line [ci skip]Vijay Dev2012-05-091-2/+0
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-0814-139/+356
|\ \
| * | simplify the alias_attribute example [ci skip]Vijay Dev2012-05-081-20/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 20:23:50 +0000