Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update railties/lib/rails/generators/rails/app/templates/config/application.rb | Egor Homakov | 2012-05-12 | 1 | -0/+3 |
| | |||||
* | Remove #=== quirk | Jon Leighton | 2012-05-11 | 3 | -17/+0 |
| | | | | Makes it consistent with Relation. Can't see a use for this. | ||||
* | Add test directory to TestTask's libs | Santiago Pastorino | 2012-05-11 | 1 | -0/+1 |
| | |||||
* | Remove useless load path modifications | Santiago Pastorino | 2012-05-11 | 12 | -38/+4 |
| | |||||
* | Lazy load I18n | Santiago Pastorino | 2012-05-11 | 4 | -6/+10 |
| | |||||
* | Move require to where it's needed | Santiago Pastorino | 2012-05-11 | 6 | -3/+6 |
| | |||||
* | Remove ruby/shim | Santiago Pastorino | 2012-05-11 | 3 | -17/+1 |
| | | | | require 'action_view' is now much faster | ||||
* | this stuff can all be handled by Relation | Jon Leighton | 2012-05-11 | 1 | -38/+0 |
| | |||||
* | extract deprecated code | Jon Leighton | 2012-05-11 | 1 | -8/+1 |
| | |||||
* | set_owner_attributes is covered by the scoping | Jon Leighton | 2012-05-11 | 1 | -4/+3 |
| | |||||
* | CollectionProxy < Relation | Jon Leighton | 2012-05-11 | 11 | -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 Leighton | 2012-05-11 | 4 | -3/+40 |
| | | | | collection-thing. | ||||
* | Merge pull request #6269 from edtsech/hash-except-test | Xavier Noria | 2012-05-11 | 1 | -0/+6 |
|\ | | | | | Add test Hash#except can receive more than one argument. | ||||
| * | Test Hash#except can receive more than one argument. | Edward Tsech | 2012-05-11 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #6268 from carlesso/master | José Valim | 2012-05-11 | 2 | -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 Carlesso | 2012-05-11 | 2 | -2/+2 |
|/ | | | | according with http://en.wikipedia.org/wiki/Robots_exclusion_standard | ||||
* | Copy literal route constraints to defaults - fixes #3571 and #6224. | Andrew White | 2012-05-11 | 4 | -3/+69 |
| | |||||
* | Fixes issue #6251 | David Padilla | 2012-05-10 | 1 | -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 #6251 | Piotr Sarnacki | 2012-05-10 | 1 | -0/+7 |
| | |||||
* | Return false for exists? with new records - fixes #6199. | Andrew White | 2012-05-10 | 3 | -2/+3 |
| | |||||
* | Don't ignore nil positional arguments for url helpers - fixes #6196. | Andrew White | 2012-05-10 | 2 | -1/+36 |
| | |||||
* | Refactor the handling of default_url_options in integration tests | Andrew White | 2012-05-10 | 2 | -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 Dev | 2012-05-11 | 2 | -28/+18 |
| | |||||
* | Merge pull request #6253 from rafmagana/master | José Valim | 2012-05-10 | 1 | -1/+1 |
|\ | | | | | remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_action | ||||
| * | remove duplicate usage of Rack::Utils.status_code in ↵ | Rafael Magana | 2012-05-10 | 1 | -1/+1 |
| | | | | | | | | LogSubscriber#process_action | ||||
* | | Merge pull request #6252 from grosser/unless_exist_for_memory_store | José Valim | 2012-05-10 | 2 | -0/+8 |
|\ \ | |/ |/| | add unless_exist option to memory store | ||||
| * | add unless_exist option to memory store | grosser | 2012-05-10 | 2 | -0/+8 |
|/ | |||||
* | Merge pull request #6244 from frodsan/fix_build_remove_key | José Valim | 2012-05-10 | 1 | -1/+1 |
|\ | | | | | Remove key argument from run_callbacks to fix build | ||||
| * | Remove key argument from run_callbacks to fix build | Francesco Rodriguez | 2012-05-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #6242 from frodsan/fix_abstract_controller | José Valim | 2012-05-10 | 1 | -1/+1 |
|\ | | | | | Removing key argument from run_callbacks method in abstract_controller | ||||
| * | removing key argument from run_callbacks - fix build | Francesco Rodriguez | 2012-05-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #6241 from frodsan/deprecate_key_callbacks | José Valim | 2012-05-10 | 4 | -6/+7 |
|\ | | | | | AS::Callbacks#run_callbacks remove key argument | ||||
| * | AS::Callbacks#run_callbacks remove key argument | Francesco Rodriguez | 2012-05-10 | 4 | -6/+7 |
|/ | |||||
* | Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rb | Jeremy Kemper | 2012-05-09 | 2 | -81/+82 |
|\ | | | | | Rename variables and remove unused code in fixtures.rb | ||||
| * | Rename some variables | Alexey Muranov | 2012-05-09 | 2 | -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.rb | Alexey Muranov | 2012-05-09 | 1 | -3/+0 |
| | | | | | | | | Remove the unused private method ActiveRecord::Fixtures#yaml_fixtures_key(path). | ||||
| * | Remove unused parameter in ::instantiate_fixtures | Alexey Muranov | 2012-05-09 | 1 | -5/+5 |
| | | | | | | | | Second parameter of Fixtures::instantiate_fixtures was not used, so i removed it. | ||||
* | | Allow to run `connection_adapters/quoting_test.rb` independently | Piotr Sarnacki | 2012-05-09 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #5362 from zenprogrammer/quoting_bug | Aaron Patterson | 2012-05-09 | 2 | -0/+12 |
|\ \ | | | | | | | Fixed bug in ActiveRecord that caused classes to be quoted incorrectly | ||||
| * | | Fixed bug in Quoting that caused classes to be quoted incorrectly | Ryan Oblak | 2012-03-09 | 2 | -0/+12 |
| | | | |||||
* | | | Merge pull request #6226 from gnufied/master | Aaron Patterson | 2012-05-09 | 2 | -6/+33 |
|\ \ \ | | | | | | | | | Update tranasaction state when record gets commited | ||||
| * | | | make both cached and record_updated accessors in one line | Hemant Kumar | 2012-05-09 | 1 | -2/+1 |
| | | | | |||||
| * | | | after_commit :on => :update should be called when save is | Hemant Kumar | 2012-05-09 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | called from after_commit callback | ||||
| * | | | Fix transaction state not changing when after record gets commited | Hemant Kumar | 2012-05-09 | 2 | -6/+27 |
| | | | | |||||
* | | | | Merge pull request #6227 from mjtko/changelog-fixes | Vijay Dev | 2012-05-09 | 1 | -22/+33 |
|\ \ \ \ | |/ / / |/| | | | Updated activesupport CHANGELOG | ||||
| * | | | Consistent CHANGELOG entry indentation. | Mark J. Titorenko | 2012-05-09 | 1 | -22/+22 |
| | | | | |||||
| * | | | Add CHANGELOG section for unreleased Rails 3.2.4; document addition of ↵ | Mark J. Titorenko | 2012-05-09 | 1 | -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 controller | Andrew White | 2012-05-09 | 2 | -11/+16 |
| | | | |||||
* | | | Fix bug when url_for changes controller. | Nikita Beloglazov | 2012-05-09 | 2 | -2/+11 |
| |/ |/| | |||||
* | | fix a couple of formatting issues [ci skip] | Vijay Dev | 2012-05-09 | 1 | -2/+4 |
| | |