aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | Merge pull request #9633 from senny/5321_make_it_lazyCarlos Antonio da Silva2013-03-093-4/+23
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniqueness validation uses a proc to specify the `:conditions` option. This is a follow up to #5321 and follows the general direction in AR to make things lazy evaluated.
| | | * | | | | | | | Uniqueness validation uses a proc to specify the `:conditions` option.Yves Senn2013-03-093-4/+23
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #5321 and follows the general direction in AR to make things lazy evaluated.
| | * | | | | | | | Merge pull request #9618 from manvsmachine/fix-postgres-enable-extension-errorCarlos Antonio da Silva2013-03-091-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix for enable_extension in postgresql_adapter. The use of quotations is required to install extensions with certain characters in them (e.g. uuid-ossp).
| | | * | | | | | | | fixes enable_extension bug in postgresql_adapterDarren Woodley2013-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of quotations is required to install extensions with certain characters in them (e.g. uuid-ossp). removes CHANGELOG entry Deemed unnecessary.
| | * | | | | | | | | Fix "ActiveRecord" => "Active Record" in changelog [ci skip]Carlos Antonio da Silva2013-03-091-4/+3
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #9371 from benmoss/access-connection-via-classJon Leighton2013-03-097-13/+19
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Access an instance's connection via its class, rather than via #connection
| | | * | | | | | | | Deprecate #connection in favour of accessing it via the classBen Moss2013-03-097-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows end-users to have a `connection` method on their models without clashing with ActiveRecord internals.
| | * | | | | | | | | Merge pull request #9626 from dasch/dasch/instrument-strong-paramsJosé Valim2013-03-092-1/+7
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use AS::Notifications to instrument Strong Params
| | | * | | | | | | | | Use the instrumentation framework to instrument Strong ParamsDaniel Schierbeck2013-03-072-1/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Fix race condition in testJon Leighton2013-03-091-2/+2
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix travis. For real this time! This is the one! The readpartial(100) meant that an earlier assert_stdout could chomp up the output that a later assert_stdout wants, meaning that the later assertion fails. Reading only 1 byte at a time ensure that we don't read any more than is necessary to verify the assertion.
| | * | | | | | | | | Merge pull request #9632 from senny/unify_the_changelogsCarlos Antonio da Silva2013-03-094-36/+37
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]
| | | * | | | | | | | | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].Yves Senn2013-03-094-36/+37
| | |/ / / / / / / / /
| | * | | | | | | | | Merge pull request #9630 from robertjwhitney/update_collection_docsCarlos Antonio da Silva2013-03-091-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update documentation for collection<< to reflect behavior for new parent objects.
| | | * | | | | | | | | Update documentation for collection<< to reflect << on new records.Robert Whitney2013-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection<< does not automatically fire update sql unless the parent object is not a new record (and thus has a primary key). eg: p = Post.new p.comments << Comment.new does not call update sql until: p.save at which point it saves the parent object and then the collection object. changes that to the
| * | | | | | | | | | | Revert "Using American English spellings over British style spellings"Vijay Dev2013-03-302-5/+5
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 573df1cf2a5d5d1f288c8a4a5d76194675141832. Reason: changelog edits aren't allowed in docrails. [ci skip]
| * | | | | | | | | | More typo / wording fixesJonathan Roes2013-03-291-6/+6
| | | | | | | | | | |
| * | | | | | | | | | Proofreading tweaksJonathan Roes2013-03-291-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Consistent hash structure - Rewording / typo fixes
* | | | | | | | | | | Added a section on Rails Controller naming conventions.Oliver Jakubiec2013-04-021-2/+12
|/ / / / / / / / / /
* | | | | | | | | | explain method invertible_for [ci skip]Neeraj Singh2013-03-291-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #130 from crafters/masterVinicius Quaiato2013-03-281-0/+26
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Adding info that Gemfile group :assets doesn't exists anymore
| * | | | | | | | | | info that Gemfile *group :assets* was removedVinicius Quaiato2013-03-291-0/+26
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | Adding info that Gemfile *group :assets* was removed on upgrading_ruby_on_rails.md
* | | | | | | | | | Minor proofingJonathan Roes2013-03-271-13/+13
| | | | | | | | | |
* | | | | | | | | | Remove unnecessary hyphen.Jonathan Roes2013-03-271-1/+1
| | | | | | | | | |
* | | | | | | | | | Extraneous syntax on guides path.Jonathan Roes2013-03-271-1/+1
| | | | | | | | | |
* | | | | | | | | | ReCAPTCHA plug-in link now points to Github repo. Plug-in is no longer ↵sthollmann2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available at the previous location
* | | | | | | | | | Fix typoCarson McDonald2013-03-261-1/+1
| | | | | | | | | |
* | | | | | | | | | localised => localizedPrathamesh Sonpatki2013-03-251-1/+1
| | | | | | | | | |
* | | | | | | | | | Fix some typosAkira Matsuda2013-03-252-2/+2
| | | | | | | | | |
* | | | | | | | | | s/Textmate/TextMate/Akira Matsuda2013-03-251-1/+1
| | | | | | | | | |
* | | | | | | | | | s/Github/GitHub/Akira Matsuda2013-03-251-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | fix some typosVipul A M2013-03-252-3/+3
| | | | | | | | |
* | | | | | | | | correct some typo in earlier commit.Deshi Xiao2013-03-241-1/+1
| | | | | | | | |
* | | | | | | | | correct test command's typoDeshi Xiao2013-03-241-13/+13
| | | | | | | | |
* | | | | | | | | view/views, asset/assetsPrathamesh Sonpatki2013-03-242-2/+2
| | | | | | | | |
* | | | | | | | | s/app\/model\//app\/models\//gAkira Matsuda2013-03-242-6/+6
| | | | | | | | |
* | | | | | | | | Typo: Migration class name would use pluralChao Ren2013-03-231-1/+1
| | | | | | | | |
* | | | | | | | | Reverted change in activemodel/CHANGELOG.md introduced by ↵Prathamesh Sonpatki2013-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d45145acdc576e46a1f1719d69bec96b5bf07b0a
* | | | | | | | | Reverted code change introduced in d45145acdc576e46a1f1719d69bec96b5bf07b0aPrathamesh Sonpatki2013-03-242-2/+2
| | | | | | | | |
* | | | | | | | | Changed 'args' to 'arguments' when used in places other than code with ↵Prathamesh Sonpatki2013-03-245-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixing few more typos
* | | | | | | | | Fixed typo : contraints -> constraintsPrathamesh Sonpatki2013-03-231-2/+2
| | | | | | | | |
* | | | | | | | | Add minitest-spec-rails to guide's testing optionsKen Collins2013-03-221-0/+1
| | | | | | | | |
* | | | | | | | | Fix typoCarson McDonald2013-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | fix the initializer block example and clarifyCarlos Puchol2013-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify that the contents of the block is expected to return a string. the previous example executed puts and the initializer got nothing. also, made it consistent with the single-line example to be more clear as to what's going on
* | | | | | | | | Remove duplicated accepts_nested_attributes descriptionma2gedev2013-03-221-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there are just the same description about accepts_nested_attributes [ci skip]
* | | | | | | | | Using American English spellings over British style spellingsPrathamesh Sonpatki2013-03-212-5/+5
| | | | | | | | |
* | | | | | | | | Added link to Turbolinks RailscastPrathamesh Sonpatki2013-03-211-0/+1
| | | | | | | | |
* | | | | | | | | Update documentation for Where chained modifiers.Ryan Sandridge2013-03-191-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where.like and where.not_like were removed in 8d02afeaee, but the guide was not updated.
* | | | | | | | | fix introduced `:` ; fix another typoVipul A M2013-03-202-2/+2
| | | | | | | | |
* | | | | | | | | Undo bad change in cf0931166be13dbbe660Steve Klabnik2013-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't know that this was about RDoc!
* | | | | | | | | more typos in guidesVipul A M2013-03-202-2/+2
| | | | | | | | |