Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | Fixed a grammatical error in Booleans section of API documentation guide | Zachary Scott | 2014-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | from e1e17a5 | ||||
| * | | | adds a section about booleans in the API guidelines [ci skip] | Xavier Noria | 2014-02-09 | 1 | -0/+47 |
| | | | | |||||
| * | | | Use full-length version of multiple from c7abc51 | Zachary Scott | 2014-02-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | docs, link MySQL manual for multi column indexes. [ci ckip]. | Yves Senn | 2014-02-09 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | Closes #9131. | ||||
| * | | | Fixed spelling error: `extracetd` => `extracted` | Calvin Tam | 2014-02-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove old comments about suppressing warnings. | Vipul A M | 2014-01-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | `framwork` => `framework` | Vipul A M | 2014-01-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | `easiy` => `easy` | Vipul A M | 2014-01-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | `requies` => `requires` | Vipul A M | 2014-01-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove duplicate configuration option for ActiveSupport [ci skip] | Zachary Scott | 2014-01-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | Fixes rails/rails#13732 | ||||
* | | | | Remove end of line whitespace from bb87c16 | Zachary Scott | 2014-02-09 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #13952 from prathamesh-sonpatki/testing | Yves Senn | 2014-02-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip] | ||||
| * | | | | [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip] | Prathamesh Sonpatki | 2014-02-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix wordy sentence | Matthew Nicholas Bradley | 2014-02-07 | 1 | -6/+5 |
|/ / / / | |||||
* | | | | Merge branch 'dump-schema-after-migration-flag' of ↵ | Xavier Noria | 2014-02-06 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | | Add config to disable schema dump after migration | Emil Soman | 2014-02-06 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a config on Active Record named `dump_schema_after_migration` * Schema dump doesn't happen if the config is set to false * Set default value of the config to true * Set config in generated production environment file to false * Update configuration guide * Update CHANGELOG | ||||
* | | | | | docs, Associations also raise on name conflicts. [ci skip] | Yves Senn | 2014-02-06 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | Follow up to https://github.com/rails/rails/commit/580f0b61dc99c6854fa930a761d28a3ab08163f7#commitcomment-5293470 | ||||
* | | | | | synchronize 4.1 release notes with CHANGELOGS. [ci skip] | Yves Senn | 2014-02-06 | 1 | -4/+77 |
| | | | | | | | | | | | | | | | | | | | | /cc @chancancode | ||||
* | | | | | update contribution doc grammar. [ci skip] | dpmehta02 | 2014-02-06 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Manually applied from #13951. - Discussion at #13947. - Removed trailing whitespace from https://github.com/dpmehta02/rails/commit/18044e86af93672dfc38befbe974261e87b3518d /cc @dpmehta02 | ||||
* | | | | | Removed unused commented code [ci skip] | Arun Agrawal | 2014-02-05 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in #13940 this can be removed We can document this somewhere else in testing guides. | ||||
* | | | | | Fixed typos [ci skip] | Calvin Tam | 2014-02-05 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #13943 from loganhasson/master | Rafael Mendonça França | 2014-02-04 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [ci skip] Add missing 'task' to note on Running Migrations | ||||
| * | | | | [ci skip] Add missing 'task' to note on Running Migrations | Logan Hasson | 2014-02-04 | 1 | -1/+1 |
| | | | | |