aboutsummaryrefslogtreecommitdiffstats
path: root/guides
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-073-13/+21
|\ | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
| * Improve collision explanation for Hash#transform_keys.Hendy Tanata2014-02-281-3/+3
| | | | | | | | | | | | | | Based on comments at https://github.com/rails/docrails/commit/42417b0013819e573be9ffc5402e179003156e8e#commitcomment-5527251 [skip ci]
| * Fix code alignment in duplicable? guide.Hendy Tanata2014-02-271-2/+2
| | | | | | | | [skip ci]
| * Improve guide for Hash#transform_keys and related methods.Hendy Tanata2014-02-271-6/+15
| | | | | | | | [skip ci]
| * Tweak Configuring Guide languageGaurish Sharma2014-02-231-1/+1
| | | | | | the fact that Rails is multi-thread by default is not very relevant. see https://github.com/rails/rails/pull/13998 [ci skip]
| * typos fixesMikhail Dieterle2014-02-221-4/+4
| |
* | Merge pull request #14257 from killthekitten/patch-1Vijay Dev2014-03-061-0/+20
|\ \ | | | | | | Add "Low-Level Caching" part to "Caching With Rails" guide
| * | [ci skip] Add "Low-Level Caching" part to "Caching With Rails"Nikolay Shebanov2014-03-061-0/+20
| | |
* | | Merge pull request #14285 from ↵Aaron Patterson2014-03-061-2/+5
|\ \ \ | | | | | | | | | | | | | | | | sikachu/master-revert-render-body-remove-content-type Do note remove `Content-Type` when `render :body`
| * | | Do note remove `Content-Type` when `render :body`Prem Sichanugrist2014-03-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `render :body` should just not set the `Content-Type` header. By removing the header, it breaks the compatibility with other parts. After this commit, `render :body` will returns `text/html` content type, sets by default from `ActionDispatch::Response`, and it will preserve the overridden content type if you override it. Fixes #14197, #14238 This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da.
* | | | Fix guide about `config.active_record.default_timezone` [ci skip]joker10072014-03-061-1/+1
|/ / / | | | | | | | | | Now the initial value of ActiveRecord.default_timezone is always :utc
* / / docs, flash message keys are normalized to strings. [ci skip]Yves Senn2014-03-051-0/+20
|/ / | | | | | | This is a follow up to a668beffd64106a1e1fedb71cc25eaaa11baf0c1
* | [ci skip] use secrets.secret_key_base instead of config.secret_key_baseKuldeep Aggarwal2014-03-012-4/+11
| | | | | | | | use secrets.yml instead of secret_token.rb
* | Improve a bit the 4.1 release notes [ci skip]Robin Dupret2014-02-281-4/+6
| | | | | | | | | | Fix a few typos. #present_in has been changed to #presence_in through commit d61baee5.
* | [ci skip] use secrets.yml instead of secret_token.rb in the action ↵Brian Thomas Storti2014-02-271-3/+18
| | | | | | | | controller guide
* | Fixes docs typo in nested resource path helpers [skip ci]Gareth du Plooy2014-02-261-18/+18
| |
* | [ci skip] Update list of files extensions in rake notes guiderobertomiranda2014-02-261-1/+1
| |
* | [ci skip] remove guide section on models in migrationsLuke Steensen2014-02-261-153/+0
| | | | | | | | | | | | Both examples given are incorrect, and no one can seem to come up with a realistic situation where this is an actual problem. For now, it seems like the best thing to do is just scrap the section altogether.
* | Bump version of bcrypt gemT.J. Schuck2014-02-251-1/+1
| |
* | Optimize getting started guide images, and use png instead of jpgCarlos Antonio da Silva2014-02-2516-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We noticed the rails gem increased in size between the beta and rc versions, and the reason is that some guides images were updated but not properly optimized, and one image changed from png to jpg, way bigger. Converting the jpg image back to png, and using ImageOptim to optimize all the images for web view, improves the situation [ci skip]. --- In current master/4-1-stable: 508K guides/assets/images/getting_started/ In v4.1.0.beta1: 268K guides/assets/images/getting_started/ In 4-0-stable 328K guides/assets/images/getting_started/ After the patch: 260K guides/assets/images/getting_started/
* | :scissors: [ci skip]Carlos Antonio da Silva2014-02-251-5/+5
| |
* | Point master changelogs to 4-1-stable branchCarlos Antonio da Silva2014-02-251-13/+1
| | | | | | | | Remove 4-1 related entries from master [ci skip]
* | [skip ci] Standardized punctuation.ch33hau2014-02-251-3/+3
| |
* | [ci skip] update guides to new version of rails 3.2.xKuldeep Aggarwal2014-02-211-2/+2
| |
* | Merge pull request #14086 from jingweno/masterArthur Nogueira Neves2014-02-201-1/+1
|\ \ | |/ |/| Fix the javascript path in guide for asset modules [skip ci]
| * [skip ci] Fix the javascript path in guide for asset modulesJingwen Owen Ou2014-02-201-1/+1
| |
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-201-0/+7
|\ \
| * | Add tip about using RDoc's --pipe command to quickly test the output ofZachary Scott2014-02-101-0/+7
| | | | | | | | | | | | | | | | | | | | | a piece of documentation. This can be useful for trying out combinations of markup and code, as discussed in rails/rails@225bcad
* | | change 'assert !' to 'assert_not' in guides [ci skip]Greg Molnar2014-02-201-3/+3
| | |
* | | Pointing to latest guides [ci skip]Arun Agrawal2014-02-191-1/+1
| | |
* | | [ci skip] Close the meta tag with '/>' instead of '>'Prakash Murthy2014-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the 42 instances of `end tag for "meta" omitted, but OMITTAG NO was specified` error message that comes up when the full railsguides are validated. Full error list at https://gist.github.com/prakashmurthy/9086679.
* | | Typo fix for unscopeAmit Thawait2014-02-181-1/+1
| | |
* | | Sync 4.1 release notes with changes since 7f648bc7 [ci skip]Godfrey Chan2014-02-181-3/+11
| | |
* | | Update upgrading guide regarding `render :text`Prem Sichanugrist2014-02-181-0/+19
| | |
* | | Update guides for new rendering optionsPrem Sichanugrist2014-02-183-6/+38
| | | | | | | | | | | | | | | * Introduces `:plain`, `:html`, `:body` render option. * Update guide to use `render :plain` instead of `render :text`.
* | | Merge pull request #14095 from rails/rm-scopesRafael Mendonça França2014-02-183-12/+85
|\ \ \ | | | | | | | | Document `default_scope` changes
| * | | Don't use `# =>` when it is not the expression valuesRafael Mendonça França2014-02-182-17/+17
| | | | | | | | | | | | | | | | [ci skip]
| * | | Fix the column name [ci skip]Rafael Mendonça França2014-02-182-8/+8
| | | |
| * | | Document the default scopes change on the release notes, CHANGELOGRafael Mendonça França2014-02-182-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | and upgrating guides [ci skip]
| * | | Aesthetic [ci skip]Rafael Mendonça França2014-02-181-4/+4
| | | |
| * | | Tell default_scope are prepended [ci skip]Rafael Mendonça França2014-02-181-1/+1
| | | |
| * | | Updated doc for default scope [ci skip]Rashmi Yadav2014-02-181-4/+4
| | | |
* | | | Minor grammar/punctuation fixes [ci skip]Carlos Antonio da Silva2014-02-181-4/+3
| | | |
* | | | Doc: assets:precompile:all was removed on 4 [skip ci]Arthur Neves2014-02-181-1/+1
|/ / /
* | | Merge pull request #14087 from 10io/patch-1Carlos Antonio da Silva2014-02-171-1/+1
|\ \ \ | |_|/ |/| | Fix coffeescript sample [ci skip]
| * | Fix coffeescript sample [ci skip]David Fernandez2014-02-131-1/+1
| | | | | | | | | Replace bind() with on() as suggested by the JQuery bind() documentation: https://api.jquery.com/bind/
* | | Merge pull request #13937 from ktaragorn/guides_fixesVijay Dev2014-02-162-3/+14
|\ \ \ | | | | | | | | Guides fixes
| * | | Getting started guide fixes & Explain X-SendFile a little better, with linksKarthik T2014-02-142-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain how form_for :article is able to pull in the properties of @article Make it clear that article_id is generated due to the association set up Add link to the rails function that uses X-Sendfile. Add links to apache and nginx docs for the header
* | | | Add verb to sanitization noteDave Jachimiak2014-02-141-1/+1
| | | |
* | | | fix guide active_support_core_extensions. add Note to String#indent [ci skip]tbpgr2014-02-141-0/+2
| | | |