aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * fix typo in String#firstFrancesco Rodriguez2012-05-111-1/+1
| | |
| | * added docs to String#firstFrancesco Rodriguez2012-05-111-0/+11
| | |
| | * added docs to String#fromFrancesco Rodriguez2012-05-111-0/+13
| | |
| | * improve String#to docsFrancesco Rodriguez2012-05-111-2/+2
| | |
| | * added docs to String#toFrancesco Rodriguez2012-05-111-0/+13
| | |
| | * Merge branch 'master' of https://github.com/lifo/docrailsEric Carty-Fickes2012-05-111-0/+25
| | |\
| | | * added docs to String#atFrancesco Rodriguez2012-05-111-0/+25
| | | |
| | * | Clarify expire_action with namespaced controllersEric Carty-Fickes2012-05-111-0/+36
| | |/
| | * better wordingHrvoje Šimić2012-05-111-4/+4
| | |
| | * missing 'with'Hrvoje Šimić2012-05-111-1/+1
| | |
| | * Move HTTP Token auth docs above the Token moduleElia Schito2012-05-111-42/+44
| | |
| | * Update guides/source/configuring.textileEgor Homakov2012-05-111-1/+1
| | |
| | * Update guides/source/configuring.textileEgor Homakov2012-05-111-1/+1
| | |
| | * Fix copypaste. [ci skip]Edward Tsech2012-05-111-2/+2
| | |
| | * Modified template in sample is new.html.erb, not index.html.erbBen Wilhelm2012-05-101-1/+1
| | |
| | * deleting empty lines in docs partsFrancesco Rodriguez2012-05-101-8/+0
| | |
| | * remove inappropriate comma Nick Novitski2012-05-091-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 Dev2012-05-122-2/+2
| | |
| * | Merge pull request #6277 from homakov/patch-6José Valim2012-05-121-0/+3
| |\ \ | | | | | | | | Comment for active_support's option in application.rb
| | * | Update railties/lib/rails/generators/rails/app/templates/config/application.rbEgor Homakov2012-05-121-0/+3
| | | |
| * | | Revert "Merge pull request #6142 from spartan-developer/master"José Valim2012-05-124-10/+12
| | | | | | | | | | | | | | | | | | | | This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94.
| * | | Remove wrong rack/utils dependency from ASSantiago Pastorino2012-05-121-3/+3
| | | | | | | | | | | | | | | | Closes #6274
| * | | Merge pull request #6281 from acapilleri/mispelling_errors_in_render_text_testVijay Dev2012-05-122-3/+3
| |\ \ \ | | | | | | | | | | mispelling errors in render_text_test.rb
| | * | | mispelling errors in render_text_test.rb and sqlite_specific_schemaangelo giovanni capilleri2012-05-122-3/+3
| | | | |
| * | | | Merge pull request #6278 from GRoguelon/masterVijay Dev2012-05-122-2/+2
| |\ \ \ \ | | | | | | | | | | | | Add commas missing in performance tests
| | * | | | Add commas missing in performance testsGeoffrey Roguelon2012-05-122-2/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #6280 from nashby/private-tryJon Leighton2012-05-123-3/+17
| |\ \ \ \ | | |_|/ / | |/| | | Object#try can't call private methods
| | * | | Object#try can't call private methodsVasiliy Ermolovich2012-05-123-3/+17
| | |/ /
| * | | Merge pull request #6142 from spartan-developer/masterJosé Valim2012-05-124-12/+10
| |\ \ \ | | | | | | | | | | refactored extracting :size => 'XxY' into an extract_size! method
| | * | | refactored extracting :size => 'XxY' into an extract_size! methodNicholas Yianilos2012-05-034-12/+10
| | | | |
| * | | | Merge pull request #6279 from ↵Xavier Noria2012-05-121-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | acapilleri/mispelling_error_in_actionpach_changelog mispelling error in actionpach changelog
| | * | | mispelling error in actionpach changelogangelo giovanni capilleri2012-05-121-1/+1
| |/ / /
| * | | Remove #=== quirkJon Leighton2012-05-113-17/+0
| | | | | | | | | | | | | | | | Makes it consistent with Relation. Can't see a use for this.
| * | | Add test directory to TestTask's libsSantiago Pastorino2012-05-111-0/+1
| | | |
| * | | Remove useless load path modificationsSantiago Pastorino2012-05-1112-38/+4
| | | |
| * | | Lazy load I18nSantiago Pastorino2012-05-114-6/+10
| | | |
| * | | 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
| | | |