Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Typppo | Akira Matsuda | 2013-03-06 | 3 | -4/+4 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-05 | 8 | -11/+9 |
|\ | |||||
| * | Fix typo | Carson McDonald | 2013-03-05 | 1 | -1/+1 |
| | | |||||
| * | Remove reference to BugMash. Link hasn't been updated in 4 years. | Jonathan Roes | 2013-03-05 | 1 | -2/+0 |
| | | |||||
| * | Fix WhereChain docs to mention only not | Ernie Miller | 2013-03-04 | 1 | -1/+1 |
| | | |||||
| * | Small Typo | Lebin Sebastian F | 2013-03-04 | 1 | -1/+1 |
| | | |||||
| * | Add explanation of :dependent => :restrict | David Deller | 2013-03-01 | 1 | -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 Hertzel | 2013-03-01 | 1 | -2/+0 |
| | | | | | | | | This reverts commit f8461f73c77c186ad0aa735fe9877990bffe1990. | ||||
| * | Fixed grammatical error and simplified paragraph concerning controllers. | Christine Hertzel | 2013-03-01 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com> | ||||
| * | Clarified removal of public/index.html file | Chelsea Macaluso | 2013-03-01 | 1 | -0/+2 |
| | | | | | | | | Signed-off-by: Trent Michaels <t.michaels@modcloth.com> | ||||
| * | Clarified need to remove existing code in welcome index. | Trent Michaels | 2013-03-01 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com> | ||||
| * | fix broken links to README docs in intro | Mike Munroe | 2013-02-28 | 1 | -2/+2 |
| | | |||||
| * | change log4r link to most recent, updated location | Mike Munroe | 2013-02-28 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9564 from robertomiranda/useless_gsub | Guillermo Iguaran | 2013-03-05 | 4 | -5/+5 |
|\ \ | | | | | | | change useless gsub to tr | ||||
| * | | change useless gsub to tr | robertomiranda | 2013-03-05 | 4 | -5/+5 |
|/ / | |||||
* | | Merge pull request #9042 from senny/9034_float_0_0_is_always_dirty | Carlos Antonio da Silva | 2013-03-05 | 3 | -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 dirty | Yves Senn | 2013-03-05 | 3 | -1/+32 |
| | | | |||||
* | | | Merge pull request #9561 from ↵ | Carlos Antonio da Silva | 2013-03-05 | 1 | -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 explicit | Boris Staal | 2013-03-05 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #9557 from bonsaiben/useless_gsub | Carlos Antonio da Silva | 2013-03-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Change useless gsub to delete | ||||
| * | | | change useless gsub to delete | Benjamin Sullivan | 2013-03-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix typo in AC overview guide [ci skip] | Carlos Antonio da Silva | 2013-03-05 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #9556 from senny/strong_params_examples | Xavier Noria | 2013-03-05 | 1 | -0/+21 |
|\ \ \ | |/ / |/| | | strong parameters example for default values using `fetch`. | ||||
| * | | example for `accepts_nested_attribtues_for` and strong parameters. | Yves Senn | 2013-03-05 | 1 | -0/+9 |
| | | | | | | | | | | | | Closes #9558. | ||||
| * | | strong parameters example for default values using `fetch`. [ci skip] | Yves Senn | 2013-03-05 | 1 | -0/+12 |
|/ / | | | | | | | Origin: #9534. | ||||
* | | Merge pull request #9554 from tmm1/string-gsub-hash | José Valim | 2013-03-04 | 1 | -2/+2 |
|\ \ | | | | | | | Use 1.9 String#gsub syntax | ||||
| * | | Call String#gsub with Hash directly | Aman Gupta | 2013-03-04 | 1 | -2/+2 |
|/ / | |||||
* | | adds guides/.document to tell rdoc not to process this directory | Xavier Noria | 2013-03-04 | 1 | -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_sync | Rafael Mendonça França | 2013-03-04 | 3 | -34/+60 |
|\ \ | | | | | | | `ActiveRecord::Base.include_root_in_json` is `false` by default. | ||||
| * | | `ActiveRecord::Base.include_root_in_json` is `false` by default. | Yves Senn | 2013-03-04 | 2 | -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 Senn | 2013-03-04 | 1 | -33/+55 |
|/ / | |||||
* | | only calculate next_id when we need a new method defined | Aaron Patterson | 2013-03-04 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #9541 from maximerety/fix_7774 | José Valim | 2013-03-04 | 2 | -1/+6 |
|\ \ | | | | | | | Fix formats on xhr requests when HTTP_ACCEPT is empty string | ||||
| * | | Fix formats on xhr requests when HTTP_ACCEPT is empty string | maximerety | 2013-03-04 | 2 | -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-1 | Xavier Noria | 2013-03-04 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | Fixed typo in active record's changelog | ||||
| * | | Fixed typo in active record's changelog | Dimko | 2013-03-04 | 1 | -3/+3 |
|/ / | |||||
* | | Remove .all usage from unscope doc examples [ci skip] | Carlos Antonio da Silva | 2013-03-04 | 1 | -4/+4 |
| | | |||||
* | | Use 1.9 hash style in changelog and doc examples [ci skip] | Carlos Antonio da Silva | 2013-03-04 | 2 | -6/+6 |
| | | |||||
* | | Merge pull request #9537 from NARKOZ/patch-6 | Steve Klabnik | 2013-03-04 | 2 | -4/+6 |
|\ \ | | | | | | | add prompt to 422 page to check logs | ||||
| * | | add prompt to 422 page to check logs | Nihad Abbasov | 2013-03-04 | 2 | -4/+6 |
|/ / | |||||
* | | Merge pull request #9200 from wangjohn/unscoping_activerecord_merging | Jeremy Kemper | 2013-03-03 | 4 | -0/+275 |
|\ \ | | | | | | | Introduce relation #unscope | ||||
| * | | Created an unscope method for removing relations from a chain of | wangjohn | 2013-03-03 | 4 | -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-example | Carlos Antonio da Silva | 2013-03-03 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | In example fix sql that is generated from scoping | ||||
| * | | fix the sql that is generated from scoping | Neeraj Singh | 2013-03-03 | 1 | -1/+2 |
| | | | |||||
* | | | Bring config.allow_concurrency back | José Valim | 2013-03-03 | 3 | -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 helpers | Andrew White | 2013-03-03 | 4 | -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_guide | Xavier Noria | 2013-03-03 | 1 | -0/+118 |
|\ \ \ | | | | | | | | | integrate the strong params README into the AC guide. | ||||
| * | | | integrate the strong params README into the AC guide. | Yves Senn | 2013-03-03 | 1 | -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/master | Guillermo Iguaran | 2013-03-02 | 8 | -67/+254 |
|\ \ \ | | | | | | | | | New 404, 422, 500 pages, they are more stylish and bring ruby essence… | ||||
| * | | | New beauty pages(404, 422, 500) | Stanislav | 2013-03-02 | 8 | -67/+254 |
| | | | | | | | | | | | | | | | | | | | | | | | | moving changelog note to unreleased section New beauty pages(404, 422, 500) |