aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-058-11/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix typoCarson McDonald2013-03-051-1/+1
| | | | | | | |
| * | | | | | | Remove reference to BugMash. Link hasn't been updated in 4 years.Jonathan Roes2013-03-051-2/+0
| | | | | | | |
| * | | | | | | Fix WhereChain docs to mention only notErnie Miller2013-03-041-1/+1
| | | | | | | |
| * | | | | | | Small TypoLebin Sebastian F2013-03-041-1/+1
| | | | | | | |
| * | | | | | | Add explanation of :dependent => :restrictDavid Deller2013-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Based on information here: http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#method-i-has_many
| * | | | | | | Reverting commit regarding public/index.html (no longer in Rails 4.)Christine Hertzel2013-03-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f8461f73c77c186ad0aa735fe9877990bffe1990.
| * | | | | | | Fixed grammatical error and simplified paragraph concerning controllers.Christine Hertzel2013-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com>
| * | | | | | | Clarified removal of public/index.html fileChelsea Macaluso2013-03-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Trent Michaels <t.michaels@modcloth.com>
| * | | | | | | Clarified need to remove existing code in welcome index.Trent Michaels2013-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com>
| * | | | | | | fix broken links to README docs in introMike Munroe2013-02-281-2/+2
| | | | | | | |
| * | | | | | | change log4r link to most recent, updated locationMike Munroe2013-02-281-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #9564 from robertomiranda/useless_gsubGuillermo Iguaran2013-03-054-5/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | change useless gsub to tr
| * | | | | | | change useless gsub to trrobertomiranda2013-03-054-5/+5
|/ / / / / / /
* | | | | | | Merge pull request #9042 from senny/9034_float_0_0_is_always_dirtyCarlos Antonio da Silva2013-03-053-1/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning '0.0' to a nullable numeric column does not make it dirty Example: product = Product.create price: 0.0 product.price = '0.0' product.changed? # => false (this used to return true) product.changes # => {} (this used to return { price: [0.0, 0.0] })
| * | | | | | | assigning '0.0' to a nullable numeric column does not make it dirtyYves Senn2013-03-053-1/+32
| | | | | | | |
* | | | | | | | Merge pull request #9561 from ↵Carlos Antonio da Silva2013-03-051-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | inossidabile/explicit_match_via_requirement_exception_message Routing match `via` option requirement exception message made more explicit
| * | | | | | | Routing match `via` option requirement exception message made more explicitBoris Staal2013-03-051-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #9557 from bonsaiben/useless_gsubCarlos Antonio da Silva2013-03-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change useless gsub to delete
| * | | | | | | | change useless gsub to deleteBenjamin Sullivan2013-03-051-1/+1
| | | | | | | | |
* | | | | | | | | Fix typo in AC overview guide [ci skip]Carlos Antonio da Silva2013-03-051-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #9556 from senny/strong_params_examplesXavier Noria2013-03-051-0/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | strong parameters example for default values using `fetch`.
| * | | | | | | example for `accepts_nested_attribtues_for` and strong parameters.Yves Senn2013-03-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9558.
| * | | | | | | strong parameters example for default values using `fetch`. [ci skip]Yves Senn2013-03-051-0/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Origin: #9534.
* | | | | | | Merge pull request #9554 from tmm1/string-gsub-hashJosé Valim2013-03-041-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use 1.9 String#gsub syntax
| * | | | | | | Call String#gsub with Hash directlyAman Gupta2013-03-041-2/+2
|/ / / / / / /
* | | | | | | adds guides/.document to tell rdoc not to process this directoryXavier Noria2013-03-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Rails 4 gem is installed rdoc sees markdown files below the guides directory and processes them. With an empty .document file we prevent that from happening. Thanks to @drbrain for the tip.
* | | | | | | Merge pull request #9467 from senny/9459_include_json_root_out_of_syncRafael Mendonça França2013-03-043-34/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | `ActiveRecord::Base.include_root_in_json` is `false` by default.
| * | | | | | | `ActiveRecord::Base.include_root_in_json` is `false` by default.Yves Senn2013-03-042-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9459. The PR #6597 unified the configuration for `include_root_in_json` in AM and AR to `false`. Later on with the refactoring commit: e030f26 the value in AR was set to `true` but I think this was not on purpose. With this commit both AM and AR will have the same configuration for `include_root_in_json`, which is `false`.
| * | | | | | | rewrite tests to have no side-effects on `include_root_in_json`.Yves Senn2013-03-041-33/+55
|/ / / / / / /
* | / / / / / only calculate next_id when we need a new method definedAaron Patterson2013-03-041-1/+2
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #9541 from maximerety/fix_7774José Valim2013-03-042-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix formats on xhr requests when HTTP_ACCEPT is empty string
| * | | | | | Fix formats on xhr requests when HTTP_ACCEPT is empty stringmaximerety2013-03-042-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ActionDispatch::Request#formats on xhr requests when HTTP_ACCEPT header is empty string. About issue #7774, same fix as in commit bebb02f but for xhr requests.
* | | | | | | Merge pull request #9540 from dimko/patch-1Xavier Noria2013-03-041-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fixed typo in active record's changelog
| * | | | | | Fixed typo in active record's changelogDimko2013-03-041-3/+3
|/ / / / / /
* | | | | | Remove .all usage from unscope doc examples [ci skip]Carlos Antonio da Silva2013-03-041-4/+4
| | | | | |
* | | | | | Use 1.9 hash style in changelog and doc examples [ci skip]Carlos Antonio da Silva2013-03-042-6/+6
| | | | | |
* | | | | | Merge pull request #9537 from NARKOZ/patch-6Steve Klabnik2013-03-042-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | add prompt to 422 page to check logs
| * | | | | | add prompt to 422 page to check logsNihad Abbasov2013-03-042-4/+6
|/ / / / / /
* | | | | | Merge pull request #9200 from wangjohn/unscoping_activerecord_mergingJeremy Kemper2013-03-034-0/+275
|\ \ \ \ \ \ | | | | | | | | | | | | | | Introduce relation #unscope
| * | | | | | Created an unscope method for removing relations from a chain ofwangjohn2013-03-034-0/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | relations. Specific where values can be unscoped, and the unscope method still works when relations are merged or combined.
* | | | | | | Merge pull request #9532 from neerajdotname/fix-sql-in-exampleCarlos Antonio da Silva2013-03-031-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | In example fix sql that is generated from scoping
| * | | | | | fix the sql that is generated from scopingNeeraj Singh2013-03-031-1/+2
| | | | | | |
* | | | | | | Bring config.allow_concurrency backJosé Valim2013-03-033-19/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the Rack::Lock still exists in development, let's provide a way to disable it explicitly.
* | | | | | | Use custom visitor class for optimized url helpersAndrew White2013-03-034-9/+19
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than trying to use gsub to remove the optional route segments, which will fail with nested optional segments, use a custom visitor class that returns a empty string for group nodes. Closes #9524
* | | | | | Merge pull request #9465 from senny/document_strong_params_in_ac_guideXavier Noria2013-03-031-0/+118
|\ \ \ \ \ \ | | | | | | | | | | | | | | integrate the strong params README into the AC guide.
| * | | | | | integrate the strong params README into the AC guide.Yves Senn2013-03-031-0/+118
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current ActionController guide does not mention strong parameters at all. I integrated the README into the guide to explain the API. I also included a section to illustrate that the API does not solve all possible whitelisting scenarios. The origin was #9454.
* | | | | | Merge pull request #9512 from Jacke/masterGuillermo Iguaran2013-03-028-67/+254
|\ \ \ \ \ \ | | | | | | | | | | | | | | New 404, 422, 500 pages, they are more stylish and bring ruby essence…
| * | | | | | New beauty pages(404, 422, 500)Stanislav2013-03-028-67/+254
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | moving changelog note to unreleased section New beauty pages(404, 422, 500)
* | | | | | Remove hard coded references to Active Record in railtiesJosé Valim2013-03-025-23/+11
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 10:50:24 +0000