| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Modified template in sample is new.html.erb, not index.html.erb | Ben Wilhelm | 2012-05-10 | 1 | -1/+1 | |
| | | | ||||||
| | * | deleting empty lines in docs parts | Francesco Rodriguez | 2012-05-10 | 1 | -8/+0 | |
| | | | ||||||
| | * | remove inappropriate comma | Nick Novitski | 2012-05-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | A qualifying clause beginning with words like "as", "if", or "although" should have a comma separating it from any following clauses in a sentence, but should not have a comma immediately after the beginning word, unless it is to separate a third, non-essential clause. Example 1: "Although I would quite like to go to lunch with you, I find myself instead writing a detailed commit message to justify a single-character documentation change." Example 2: "Despite, as you might well imagine, wishing I hadn't even noticed it in the first place, I still felt the error was worth correcting." | |||||
| * | | s/wether/whether [ci skip] | Vijay Dev | 2012-05-12 | 2 | -2/+2 | |
| | | | ||||||
| * | | Merge pull request #6277 from homakov/patch-6 | José Valim | 2012-05-12 | 1 | -0/+3 | |
| |\ \ | | | | | | | Comment for active_support's option in application.rb | |||||
| | * | | Update railties/lib/rails/generators/rails/app/templates/config/application.rb | Egor Homakov | 2012-05-12 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | Revert "Merge pull request #6142 from spartan-developer/master" | José Valim | 2012-05-12 | 4 | -10/+12 | |
| | | | | | | | | | | | | | | | | This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94. | |||||
| * | | | Remove wrong rack/utils dependency from AS | Santiago Pastorino | 2012-05-12 | 1 | -3/+3 | |
| | | | | | | | | | | | | | Closes #6274 | |||||
| * | | | Merge pull request #6281 from acapilleri/mispelling_errors_in_render_text_test | Vijay Dev | 2012-05-12 | 2 | -3/+3 | |
| |\ \ \ | | | | | | | | | mispelling errors in render_text_test.rb | |||||
| | * | | | mispelling errors in render_text_test.rb and sqlite_specific_schema | angelo giovanni capilleri | 2012-05-12 | 2 | -3/+3 | |
| | | | | | ||||||
| * | | | | Merge pull request #6278 from GRoguelon/master | Vijay Dev | 2012-05-12 | 2 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Add commas missing in performance tests | |||||
| | * | | | | Add commas missing in performance tests | Geoffrey Roguelon | 2012-05-12 | 2 | -2/+2 | |
| | | |/ / | |/| | | ||||||
| * | | | | Merge pull request #6280 from nashby/private-try | Jon Leighton | 2012-05-12 | 3 | -3/+17 | |
| |\ \ \ \ | |_|/ / |/| | | | Object#try can't call private methods | |||||
| | * | | | Object#try can't call private methods | Vasiliy Ermolovich | 2012-05-12 | 3 | -3/+17 | |
| | |/ / | ||||||
| * | | | Merge pull request #6142 from spartan-developer/master | José Valim | 2012-05-12 | 4 | -12/+10 | |
| |\ \ \ | | | | | | | | | refactored extracting :size => 'XxY' into an extract_size! method | |||||
| | * | | | refactored extracting :size => 'XxY' into an extract_size! method | Nicholas Yianilos | 2012-05-03 | 4 | -12/+10 | |
| | | | | | ||||||
| * | | | | Merge pull request #6279 from ↵ | Xavier Noria | 2012-05-12 | 1 | -1/+1 | |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | acapilleri/mispelling_error_in_actionpach_changelog mispelling error in actionpach changelog | |||||
| | * | | | mispelling error in actionpach changelog | angelo giovanni capilleri | 2012-05-12 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | 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 | |
| |/ / / | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |