Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2684 from waynn/patch-2 | Xavier Noria | 2011-08-30 | 1 | -4/+4 |
|\ | | | | | Rephrasing to sound more natural, and some grammar fixes. | ||||
| * | incorporate feedback from vijaydev and dasch to rephrase this to sound more ↵ | Waynn Lue | 2011-08-26 | 1 | -4/+4 |
| | | | | | | | | natural, and some grammar fixes. | ||||
* | | Merge pull request #2720 from biow0lf/master | Xavier Noria | 2011-08-29 | 1 | -4/+4 |
|\ \ | | | | | | | Doc fixes | ||||
| * | | Documentation fixes | Igor Zubkov | 2011-08-29 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #2723 from guilleiguaran/3-1-0-changelogs | Santiago Pastorino | 2011-08-28 | 1 | -0/+13 |
|/ / | | | | | | | Update changelogs for Rails 3.1.0 | ||||
* | | Fix failing asset debug test under 1.8 | Guillermo Iguaran | 2011-08-25 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2681 from guilleiguaran/doc-changes | Xavier Noria | 2011-08-25 | 2 | -1/+12 |
|\ \ | | | | | | | Documentation changes: Assets Pipeline guide and Railties changelog | ||||
| * | | Update Debugging Assets section of Assets Pipeline guide | Guillermo Iguaran | 2011-08-25 | 1 | -1/+8 |
| | | | |||||
| * | | Add missing CHANGELOG entries for Railties | Guillermo Iguaran | 2011-08-25 | 1 | -0/+4 |
| |/ | |||||
* | | Revert all the stuff to do with disallowing non-public methods for ↵ | Jon Leighton | 2011-08-25 | 1 | -24/+0 |
| | | | | | | | | Module#delegate | ||||
* | | Yes we need this to pass the test. we are using config.log_level. | Arun Agrawal | 2011-08-25 | 1 | -2/+2 |
| | | | | | | | | | | Fix broken test test_copying_migrations(RailtiesTest::EngineTest): NoMethodError: undefined method `log_level' for #<Rails::Engine::Configuration:0xb87a98c> | ||||
* | | Merge pull request #2688 from dasch/refactor-asset-debugging-tests | Aaron Patterson | 2011-08-25 | 2 | -42/+56 |
|\ \ | | | | | | | Refactor asset debugging tests | ||||
| * | | Move asset debugging tests into a separate test case | Daniel Schierbeck | 2011-08-25 | 2 | -42/+56 |
| |/ | | | | | | | | | | | | | Also: - Refactor AssetDebuggingTest. - Use the %r regexp syntax. That way we don't need to escape the /'s. | ||||
* | | Moved strict validation changelog entry to right place | Bogdan Gusiev | 2011-08-25 | 2 | -1/+1 |
| | | |||||
* | | Merge pull request #2563 from bogdan/internal_validation | José Valim | 2011-08-25 | 2 | -2/+6 |
|\ \ | |/ |/| | Implemented strict validation concept | ||||
| * | Add strict validation example to guides | Bogdan Gusiev | 2011-08-24 | 2 | -2/+6 |
| | | |||||
* | | fix ambiguous * and remove unused variable | Aaron Patterson | 2011-08-24 | 1 | -2/+2 |
| | | |||||
* | | fix ambiguous use of * | Aaron Patterson | 2011-08-24 | 1 | -1/+1 |
| | | |||||
* | | only define the encoding reader since we define the writer later on | Aaron Patterson | 2011-08-24 | 1 | -1/+2 |
| | | |||||
* | | we are *sure* we want to set the encoding, so silence warnings around it | Aaron Patterson | 2011-08-24 | 2 | -4/+9 |
| | | |||||
* | | the command line guide is good to go | Xavier Noria | 2011-08-24 | 1 | -1/+1 |
| | | |||||
* | | dealing with some -w warnings on startup | Aaron Patterson | 2011-08-24 | 4 | -2/+9 |
| | | |||||
* | | Add config.allow_debugging option to determine if the debug_assets query ↵ | Guillermo Iguaran | 2011-08-24 | 4 | -6/+55 |
| | | | | | | | | param can be passed by user | ||||
* | | Merge pull request #2390 from arunagw/test_for_environment_file | Santiago Pastorino | 2011-08-24 | 1 | -0/+9 |
|\ \ | | | | | | | Test added to check development.rb, test.rb and production.rb content | ||||
| * | | Test added to check mass_assignment_sanitizer is not present if ↵ | Arun Agrawal | 2011-08-03 | 1 | -0/+9 |
| | | | | | | | | | | | | --skip-active-record provided. | ||||
* | | | Remove extra word from sentence in initialization guide. | Brian Morearty | 2011-08-23 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2616 from tilsammans/patch-2 | Xavier Noria | 2011-08-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Removed my name from the changelog as the amount of blogspam became ridic | ||||
| * | | | removed the link to my blog to help stop endless comments | Joost Baaij | 2011-08-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Revert "Removed my name from the changelog as the amount of blogspam became ↵ | Joost Baaij | 2011-08-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | ridiculous. " This reverts commit 95bece9155c46a2273a3febc3a2e176b8c15df8f. | ||||
| * | | | Removed my name from the changelog as the amount of blogspam became ridiculous. | Joost Baaij | 2011-08-22 | 1 | -1/+0 |
| | | | | | | | | | | | | When will docrails be back? :-p | ||||
* | | | | Add destroy alias to engines | Guillermo Iguaran | 2011-08-22 | 1 | -2/+3 |
| | | | | |||||
* | | | | Merge pull request #2411 from ai/debug_assets_by_config | Santiago Pastorino | 2011-08-22 | 3 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Debug assets by config | ||||
| * | | | | Allow to debug assets by config.assets.debug | Andrey A.I. Sitnik | 2011-08-22 | 3 | -1/+5 |
| |/ / / | |||||
* | | | | Add Destroy Alias | Andrey Ognevsky | 2011-08-22 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added destroy alias to rails generator * add alias info for destroy command * Updated command line guides | ||||
* | | | | Merge pull request #2620 from cesario/3-1-0 | Santiago Pastorino | 2011-08-21 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Fix CI and rename 1 misleading test case. | ||||
* | | | Merge pull request #2595 from smartinez87/assets-guide | Santiago Pastorino | 2011-08-20 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Document debugging assets set by default for dev and test envs on guides | ||||
| * | | | Document debugging assets set by default for dev and test envs in the ↵ | Sebastian Martinez | 2011-08-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | asset_pipeline guide. | ||||
* | | | | minor change in the 3.1 release notes | Vijay Dev | 2011-08-20 | 1 | -1/+1 |
|/ / / | |||||
* | | | mailer guide: fixes indentation, and use fixed width fonts wherever necessary | Vijay Dev | 2011-08-20 | 1 | -31/+26 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/lifo/docrails | Xavier Noria | 2011-08-17 | 15 | -26/+5 |
|\ \ \ | |||||
| * | | | Updates to remove extra whitespaces and notably fix a whitespace issue with ↵ | Jeff Dutil | 2011-08-16 | 10 | -22/+1 |
| | | | | | | | | | | | | | | | | ajax_on_rails causing a code block not to render the entire block properly. | ||||
| * | | | Fix typo in i18n.textile header and remove extra whitespace. | Jeff Dutil | 2011-08-16 | 1 | -2/+1 |
| | | | | |||||
| * | | | Fix ruby typo to correctly render code block in initializer.textile | Jeff Dutil | 2011-08-16 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fix spacing in plugins.textile to fix html rendering and remove extra ↵ | Jeff Dutil | 2011-08-16 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | whitespace from security.textile | ||||
* | | | | fixes generation of the AR querying guide | Xavier Noria | 2011-08-17 | 1 | -2/+2 |
| |_|/ |/| | | |||||
* | | | Cleanup application.css | Rafa García | 2011-08-17 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-08-16 | 1 | -7/+9 |
|\ \ \ | |||||
| * | | | Use lazy load hooks to set parameter wrapping configuration. This means that ↵ | Jon Leighton | 2011-08-16 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint. | ||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-16 | 10 | -80/+121 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Fix formatting of active_record_validations_callbacks.textile so guide will ↵ | Jeff Dutil | 2011-08-16 | 1 | -2/+2 |
| | | | | | | | | | | | | render properly at http://edgeguides.rubyonrails.org/active_record_validations_callbacks.html#displaying-validation-errors-in-the-view |