aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2720 from biow0lf/masterXavier Noria2011-08-291-4/+4
|\ | | | | Doc fixes
| * Documentation fixesIgor Zubkov2011-08-291-4/+4
| |
* | Merge pull request #2723 from guilleiguaran/3-1-0-changelogsSantiago Pastorino2011-08-281-0/+13
|/ | | | Update changelogs for Rails 3.1.0
* Fix failing asset debug test under 1.8Guillermo Iguaran2011-08-251-1/+1
|
* Merge pull request #2681 from guilleiguaran/doc-changesXavier Noria2011-08-252-1/+12
|\ | | | | Documentation changes: Assets Pipeline guide and Railties changelog
| * Update Debugging Assets section of Assets Pipeline guideGuillermo Iguaran2011-08-251-1/+8
| |
| * Add missing CHANGELOG entries for RailtiesGuillermo Iguaran2011-08-251-0/+4
| |
* | Revert all the stuff to do with disallowing non-public methods for ↵Jon Leighton2011-08-251-24/+0
| | | | | | | | Module#delegate
* | Yes we need this to pass the test. we are using config.log_level.Arun Agrawal2011-08-251-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-testsAaron Patterson2011-08-252-42/+56
|\ \ | | | | | | Refactor asset debugging tests
| * | Move asset debugging tests into a separate test caseDaniel Schierbeck2011-08-252-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 placeBogdan Gusiev2011-08-252-1/+1
| |
* | Merge pull request #2563 from bogdan/internal_validationJosé Valim2011-08-252-2/+6
|\ \ | |/ |/| Implemented strict validation concept
| * Add strict validation example to guidesBogdan Gusiev2011-08-242-2/+6
| |
* | fix ambiguous * and remove unused variableAaron Patterson2011-08-241-2/+2
| |
* | fix ambiguous use of *Aaron Patterson2011-08-241-1/+1
| |
* | only define the encoding reader since we define the writer later onAaron Patterson2011-08-241-1/+2
| |
* | we are *sure* we want to set the encoding, so silence warnings around itAaron Patterson2011-08-242-4/+9
| |
* | the command line guide is good to goXavier Noria2011-08-241-1/+1
| |
* | dealing with some -w warnings on startupAaron Patterson2011-08-244-2/+9
| |
* | Add config.allow_debugging option to determine if the debug_assets query ↵Guillermo Iguaran2011-08-244-6/+55
| | | | | | | | param can be passed by user
* | Merge pull request #2390 from arunagw/test_for_environment_fileSantiago Pastorino2011-08-241-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 Agrawal2011-08-031-0/+9
| | | | | | | | | | | | --skip-active-record provided.
* | | Remove extra word from sentence in initialization guide.Brian Morearty2011-08-231-1/+1
| | |
* | | Merge pull request #2616 from tilsammans/patch-2Xavier Noria2011-08-231-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 commentsJoost Baaij2011-08-231-1/+1
| | | |
| * | | Revert "Removed my name from the changelog as the amount of blogspam became ↵Joost Baaij2011-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | ridiculous. " This reverts commit 95bece9155c46a2273a3febc3a2e176b8c15df8f.
| * | | Removed my name from the changelog as the amount of blogspam became ridiculous. Joost Baaij2011-08-221-1/+0
| | | | | | | | | | | | When will docrails be back? :-p
* | | | Add destroy alias to enginesGuillermo Iguaran2011-08-221-2/+3
| | | |
* | | | Merge pull request #2411 from ai/debug_assets_by_configSantiago Pastorino2011-08-223-1/+5
|\ \ \ \ | | | | | | | | | | Debug assets by config
| * | | | Allow to debug assets by config.assets.debugAndrey A.I. Sitnik2011-08-223-1/+5
| |/ / /
* | | | Add Destroy AliasAndrey Ognevsky2011-08-222-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-0Santiago Pastorino2011-08-211-1/+1
|/ / / | | | | | | | | | Fix CI and rename 1 misleading test case.
* | | Merge pull request #2595 from smartinez87/assets-guideSantiago Pastorino2011-08-201-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 Martinez2011-08-191-0/+2
| | | | | | | | | | | | | | | | asset_pipeline guide.
* | | | minor change in the 3.1 release notesVijay Dev2011-08-201-1/+1
|/ / /
* | | mailer guide: fixes indentation, and use fixed width fonts wherever necessaryVijay Dev2011-08-201-31/+26
| | |
* | | Merge branch 'master' of https://github.com/lifo/docrailsXavier Noria2011-08-1715-26/+5
|\ \ \
| * | | Updates to remove extra whitespaces and notably fix a whitespace issue with ↵Jeff Dutil2011-08-1610-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 Dutil2011-08-161-2/+1
| | | |
| * | | Fix ruby typo to correctly render code block in initializer.textileJeff Dutil2011-08-162-2/+2
| | | |
| * | | Fix spacing in plugins.textile to fix html rendering and remove extra ↵Jeff Dutil2011-08-162-1/+2
| | | | | | | | | | | | | | | | whitespace from security.textile
* | | | fixes generation of the AR querying guideXavier Noria2011-08-171-2/+2
| |_|/ |/| |
* | | Cleanup application.cssRafa García2011-08-171-3/+3
| | |
* | | Merge branch 'master' of github.com:rails/railsXavier Noria2011-08-161-7/+9
|\ \ \
| * | | Use lazy load hooks to set parameter wrapping configuration. This means that ↵Jon Leighton2011-08-161-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/docrailsXavier Noria2011-08-1610-80/+121
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix formatting of active_record_validations_callbacks.textile so guide will ↵Jeff Dutil2011-08-161-2/+2
| | | | | | | | | | | | render properly at http://edgeguides.rubyonrails.org/active_record_validations_callbacks.html#displaying-validation-errors-in-the-view
| * | document Array#append and Array#prepend methods in AS guideVijay Dev2011-08-161-0/+24
| | |
| * | Document Hash#extract!.Sebastian Martinez2011-08-151-0/+12
| | |