| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | | |||||
| * | | | add missing sharp [ci skip] | Greg Molnar | 2014-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | docs, link MySQL manual for multi column indexes. [ci ckip]. | Yves Senn | 2014-02-04 | 1 | -1/+3 |
| | | | | | | | | | | | | | Closes #9131. | ||||
| * | | | Missing closing parenthesis. | edogawaconan | 2014-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | docs, reference to ruby-lang.org. refs #13492. [ci skip] | Yves Senn | 2014-02-03 | 1 | -4/+8 |
| | | | | |||||
| * | | | Fixed minor typo [ci skip] | Calvin Tam | 2014-02-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #13780 from rohitpaulk/patch-1 | Rafael Mendonça França | 2014-01-31 | 1 | -0/+13 |
| |\ \ \ | | | | | | | | | Updated association_basics.md | ||||
| | * | | | Updated association_basics.md [ci skip] | Rohit Paul Kuruvilla | 2014-01-31 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated association_basics.md to include how to write migrations for self joins Update association_basics.md Corrected the update Update association_basics.md Typo fix Changed :employee to :manager | ||||
| * | | | | Document default trim mode for Erubis and affected ERB tags [ci skip] | Zachary Scott | 2014-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Fixes #12963 | ||||
| * | | | | fix typo and indent. [ci skip] | Yves Senn | 2014-01-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #13774 from prathamesh-sonpatki/post-to-article | Yves Senn | 2014-01-30 | 1 | -407/+429 |
| |\ \ \ \ | | | | | | | | | | | Replace Post model with Article model in getting started guide [ci skip] | ||||
| | * | | | | Replace Post with Article in getting started guide [ci skip] | Prathamesh Sonpatki | 2014-01-25 | 1 | -407/+429 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Used Article model instead of Post as it may confuse with 'post' requests - Tried to wrap the guide to 80 chars lines as much as possible. - Removed unused image - Fixes #13764 | ||||
| * | | | | Improve documentation [ci skip] | Rafael Mendonça França | 2014-01-30 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Add `travel_back` to remove stubs from `travel` and `travel_to` | Rafael Mendonça França | 2014-01-30 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Modify the session serializer implementation | Guillermo Iguaran | 2014-01-30 | 1 | -11/+5 |
| | | | | | | | | | | | | | | | | | | | | | Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes. | ||||
| * | | | | Merge pull request #13876 from sowjumn/master | Rafael Mendonça França | 2014-01-29 | 1 | -10/+5 |
| |\ \ \ \ | | | | | | | | | | | Added some style changes in asset pipeline documentation | ||||
| | * | | | | Added some style changes in asset pipeline documentation | sowjanya | 2014-01-29 | 1 | -10/+5 |
| | | | | | | |||||
| * | | | | | Fix documentation of new controller filters api [ci skip] | Kassio Borges | 2014-01-29 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The api for filters with classes change and the guides weren't updated. Now the class must respond for methods with the same name as the filter, so the `before_action` calls a `before` method, and so on. The method `#filter` has been deprecated in 4.0.0 and has been removed in 4.1.0: #7560 | ||||
| * | | | | | Allow session serializer key in config.session_store | Lukasz Sarnacki | 2014-01-29 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageEncryptor has :serializer option, where any serializer object can be passed. This commit make it possible to set this serializer from configuration level. There are predefined serializers (:marshal_serializer, :json_serialzier) and custom serializer can be passed as String, Symbol (camelized and constantized in ActionDispatch::Session namepspace) or serializer object. Default :json_serializer was also added to generators to provide secure defalt. | ||||
| * | | | | | Merge pull request #13864 from sowjumn/master | Rafael Mendonça França | 2014-01-28 | 1 | -1/+6 |
| |\| | | | | | | | | | | | | | | Added documentation for css_compressor in asset_pipeline.md | ||||
| | * | | | | Added documentation for css_compressor | sowjanya | 2014-01-28 | 1 | -1/+6 |
| | | | | | | |||||
| * | | | | | Log which keys were set to nil in deep_munge | Lukasz Sarnacki | 2014-01-28 | 3 | -0/+51 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deep_munge solves CVE-2013-0155 security vulnerability, but its behaviour is definately confuisng. This commit adds logging to deep_munge. It logs keys for which values were set to nil. Also mentions in guides were added. | ||||
| * | | | | Merge pull request #13832 from kassio/setup-for-raise-missing-translations | Rafael Mendonça França | 2014-01-27 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | Rails config for raise on missing translations | ||||
| | * | | | | Rails config for raise on missing translations | Kassio Borges | 2014-01-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a config to setup whether raise exception for missing translation or not. | ||||
| * | | | | | docs, remove deprecation entry in favor of abe6484. [ci skip] | Yves Senn | 2014-01-27 | 1 | -5/+0 |
| | | | | | | |||||
| * | | | | | mention #13314 in 4.1 release notes. refs #12140. [ci skip] | Yves Senn | 2014-01-27 | 1 | -0/+3 |
| |/ / / / | |||||
| * | | | | docs, clarify usage of `action_mailer.default_options`. [ci skip]. Closes ↵ | Yves Senn | 2014-01-27 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | #13820. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |