Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Point master changelogs to 4-1-stable branch | Carlos Antonio da Silva | 2014-02-25 | 1 | -13/+1 |
| | | | | Remove 4-1 related entries from master [ci skip] | ||||
* | [skip ci] Standardized punctuation. | ch33hau | 2014-02-25 | 1 | -3/+3 |
| | |||||
* | [ci skip] update guides to new version of rails 3.2.x | Kuldeep Aggarwal | 2014-02-21 | 1 | -2/+2 |
| | |||||
* | Merge pull request #14086 from jingweno/master | Arthur Nogueira Neves | 2014-02-20 | 1 | -1/+1 |
|\ | | | | | Fix the javascript path in guide for asset modules [skip ci] | ||||
| * | [skip ci] Fix the javascript path in guide for asset modules | Jingwen Owen Ou | 2014-02-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-02-20 | 1 | -0/+7 |
|\ \ | |||||
| * | | Add tip about using RDoc's --pipe command to quickly test the output of | Zachary Scott | 2014-02-10 | 1 | -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 Molnar | 2014-02-20 | 1 | -3/+3 |
| | | | |||||
* | | | Pointing to latest guides [ci skip] | Arun Agrawal | 2014-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | [ci skip] Close the meta tag with '/>' instead of '>' | Prakash Murthy | 2014-02-19 | 1 | -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 unscope | Amit Thawait | 2014-02-18 | 1 | -1/+1 |
| | | | |||||
* | | | Sync 4.1 release notes with changes since 7f648bc7 [ci skip] | Godfrey Chan | 2014-02-18 | 1 | -3/+11 |
| | | | |||||
* | | | Update upgrading guide regarding `render :text` | Prem Sichanugrist | 2014-02-18 | 1 | -0/+19 |
| | | | |||||
* | | | Update guides for new rendering options | Prem Sichanugrist | 2014-02-18 | 3 | -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-scopes | Rafael Mendonça França | 2014-02-18 | 3 | -12/+85 |
|\ \ \ | | | | | | | | | Document `default_scope` changes | ||||
| * | | | Don't use `# =>` when it is not the expression values | Rafael Mendonça França | 2014-02-18 | 2 | -17/+17 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Fix the column name [ci skip] | Rafael Mendonça França | 2014-02-18 | 2 | -8/+8 |
| | | | | |||||
| * | | | Document the default scopes change on the release notes, CHANGELOG | Rafael Mendonça França | 2014-02-18 | 2 | -0/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | and upgrating guides [ci skip] | ||||
| * | | | Aesthetic [ci skip] | Rafael Mendonça França | 2014-02-18 | 1 | -4/+4 |
| | | | | |||||
| * | | | Tell default_scope are prepended [ci skip] | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Updated doc for default scope [ci skip] | Rashmi Yadav | 2014-02-18 | 1 | -4/+4 |
| | | | | |||||
* | | | | Minor grammar/punctuation fixes [ci skip] | Carlos Antonio da Silva | 2014-02-18 | 1 | -4/+3 |
| | | | | |||||
* | | | | Doc: assets:precompile:all was removed on 4 [skip ci] | Arthur Neves | 2014-02-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #14087 from 10io/patch-1 | Carlos Antonio da Silva | 2014-02-17 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fix coffeescript sample [ci skip] | ||||
| * | | Fix coffeescript sample [ci skip] | David Fernandez | 2014-02-13 | 1 | -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_fixes | Vijay Dev | 2014-02-16 | 2 | -3/+14 |
|\ \ \ | | | | | | | | | Guides fixes | ||||
| * | | | Getting started guide fixes & Explain X-SendFile a little better, with links | Karthik T | 2014-02-14 | 2 | -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 note | Dave Jachimiak | 2014-02-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix guide active_support_core_extensions. add Note to String#indent [ci skip] | tbpgr | 2014-02-14 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #13945 from rails/json_cookie_serializer_improvements | Guillermo Iguaran | 2014-02-13 | 3 | -20/+47 |
|\ \ \ \ | |_|/ / |/| | | | Cookies serializer improvements | ||||
| * | | | Updated CHANGELOG, docs, guides and release notes. | Godfrey Chan | 2014-02-11 | 3 | -11/+27 |
| | | | | | | | | | | | | | | | | Also added a `cookies_serializer.rb` initializer to the app template. | ||||
| * | | | Renamed session_serializer option to cookies_serializer | Godfrey Chan | 2014-02-11 | 1 | -16/+27 |
| | | | | |||||
* | | | | Merge pull request #14023 from prathamesh-sonpatki/assert_redirected_to | Carlos Antonio da Silva | 2014-02-12 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [Testing Guide] Explain usage of assert_redirected_to with named routes and ActiveRecord objects [ci skip] | ||||
| * | | | | [Testing Guide] Explain usage of assert_redirected_to with named routes and ↵ | Prathamesh Sonpatki | 2014-02-12 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | Active Record objects [ci skip] | ||||
* | | | | Revert "Don't symbolize tainted data." [ci skip] | Xavier Noria | 2014-02-11 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: i18n whitelists now locales without passing through symbols, see https://github.com/svenfuchs/i18n/blob/master/lib/i18n.rb#L278. Therefore, this snippet is no longer a good practice. This reverts commit ec0664a6eb8906fcd31a53a1efad69bdc7fe6f5b. | ||||
* | | | | Don't symbolize tainted data. | devlin zed | 2014-02-11 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | `I18n.locale=` symbolizes its argument, so passing it `params[:locale]` allows one to DOS your application by visiting `...?locale=` URLS repeatedly, with unique values, until the never-GCed symbols monopolize the available memory. | ||||
* | | | | add patch in HTTP Verb Constraints [ci skip] | Angelo capilleri | 2014-02-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #13571 from bak/getting_started_guide | Vijay Dev | 2014-02-11 | 1 | -17/+32 |
|\ \ \ \ | |/ / / |/| | | | A pass over the Getting Started guide sections 1, 2, and 3 [ci skip] | ||||
| * | | | A pass over the Getting Started guide sections 1, 2, and 3 [ci skip] | Ben Cullen-Kerney | 2014-02-09 | 1 | -17/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add note about managing Ruby environments * Point to curated lists of Ruby learning resources * Expound on DRY and Convention over Configuration * Remove note on superuser--thankfuly coders new to Rails don't have to sudo anymore :) * Installation/verification instructions for SQLite3, since it's a dependency | ||||
* | | | | Merge pull request #14007 from kintamanimatt/missing_directory_slashes | Rafael Mendonça França | 2014-02-10 | 1 | -9/+9 |
|\ \ \ \ | | | | | | | | | | | Add missing directory slashes [ci skip] | ||||
| * | | | | Add missing directory slashes [ci skip] | Matthew Nicholas Bradley | 2014-02-10 | 1 | -9/+9 |
| | | | | | |||||
* | | | | | docs, link to HTTP and CGI header definitions. [ci skip] | Yves Senn | 2014-02-10 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | This was a reaction to: https://github.com/rails/rails/pull/9700#issuecomment-34550210 | ||||
* | | | | | docs, update broken link. [ci skip] | Yves Senn | 2014-02-10 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | from https://github.com/rack/rack/blob/master/lib/rack/server.rb#L289-L300. | ||||
* / / / | `Rails.threadsafe!` mode is deprecated | Gaurish Sharma | 2014-02-10 | 1 | -1/+1 |
|/ / / | | | | | | | | | | [ci skip] | ||||
* | | | Simplify doc [ci skip] | Vijay Dev | 2014-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | The `as` option was already explained in a previous example and doesn't need to be repeated. Explain only the `locals` option which the example is meant for. | ||||
* | | | Merge pull request #13630 from seapy/master | Vijay Dev | 2014-02-09 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fixed typo [ci skip] | ||||
| * | | | Fixed typo [ci skip] | seapy | 2014-01-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | singular is more suited to | ||||
* | | | | Merge pull request #13994 from elysdir/master | Vijay Dev | 2014-02-09 | 1 | -3/+3 |
|\ \ \ \ | |_|_|/ |/| | | | Clarifying confusing phrasing | ||||
| * | | | Clarifying confusing phrasing | Jed Hartman | 2014-02-09 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-02-09 | 5 | -6/+5 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md |