aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2724 from ↵Santiago Pastorino2011-08-281-2/+2
|\ | | | | | | | | guilleiguaran/avoid-recursive-call-sprockets-helper Avoid extra recursive call in Sprockets helpers
| * Avoid extra recursive call in Sprockets helpersGuillermo Iguaran2011-08-281-2/+2
|/
* Merge pull request #2723 from guilleiguaran/3-1-0-changelogsSantiago Pastorino2011-08-283-0/+27
| | | | Update changelogs for Rails 3.1.0
* fixing typoAaron Patterson2011-08-281-1/+1
|
* Bump rack-cache, rack-test, rack-mount and sprockets upSantiago Pastorino2011-08-281-4/+4
|
* clear and disable query cache when an exception is raised from called middlewareAaron Patterson2011-08-282-1/+33
|
* Merge pull request #2711 from dasch/patch-3Aaron Patterson2011-08-281-14/+3
|\ | | | | Refactor ActionDispatch::Http::UploadedFile
| * Refactor ActionDispatch::Http::UploadedFileDaniel Schierbeck2011-08-281-14/+3
|/
* deletes spurious arrowXavier Noria2011-08-271-1/+1
|
* Merge pull request #2714 from vijaydev/docsSantiago Pastorino2011-08-273-15/+19
|\ | | | | doc fixes
| * doc fixesVijay Dev2011-08-283-15/+19
|/
* use sdoc to generate the APIXavier Noria2011-08-272-2/+4
|
* stop messing with the load path, load path should be adjusted in the test taskAaron Patterson2011-08-261-7/+0
|
* Merge pull request #2702 from arunagw/removed_unused_varSantiago Pastorino2011-08-261-1/+1
|\ | | | | Removed Unused Variable.
| * Removed Unused Variable. Arun Agrawal2011-08-261-1/+1
|/
* Merge pull request #2699 from guilleiguaran/fix-asset-debugging-test-1.8Aaron Patterson2011-08-251-1/+1
|\ | | | | Fix failing asset debug test under 1.8
| * Fix failing asset debug test under 1.8Guillermo Iguaran2011-08-251-1/+1
|/
* Force binary data inserted for a string data type to utf-8 and log anAaron Patterson2011-08-252-3/+34
| | | | | | | | error. Strings tagged as binary will be stored in sqlite3 as blobs. It is an error to insert binary data to a string column, so an error is emitted in the log file. People are highly encouraged to track down the source of the binary strings and make sure that the encoding is set correctly before inserting to the database.
* 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-257-194/+3
| | | | | | | | Module#delegate
* | Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpersSantiago Pastorino2011-08-251-4/+4
|\ \ | | | | | | Removing redundant stringify_keys in Sprockets helpers
| * | Removing redundant stringify_keys in Sprockets helpersGuillermo Iguaran2011-08-251-4/+4
| | |
* | | Merge pull request #2695 from dasch/more-debug-assetsAaron Patterson2011-08-251-3/+1
|\ \ \ | |/ / |/| | Don't require a specific value for the ?debug flag
| * | Don't require a specific value for the ?debug flagDaniel Schierbeck2011-08-251-3/+1
|/ / | | | | | | | | Previously, only "1" and "true" were accepted. This change makes any value, or no value at all, have the same effect.
* | 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 #2690 from dasch/pretty-debug-assetsAaron Patterson2011-08-251-4/+4
|\ \ | | | | | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable
| * | Make Sprockets::Helpers::RailsHelper#debug_assets? more readableDaniel Schierbeck2011-08-251-4/+4
| |/
* | 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.
* | Merge pull request #2694 from bogdan/internal_validationSantiago Pastorino2011-08-252-1/+1
|\ \ | | | | | | Moved strict validation changelog entry to right place
| * | Moved strict validation changelog entry to right placeBogdan Gusiev2011-08-252-1/+1
|/ /
* | Tiny refactorSantiago Pastorino2011-08-251-4/+7
| |
* | Merge pull request #2491 from waynn/fix_symbolSantiago Pastorino2011-08-252-2/+8
|\ \ | | | | | | fix destructive stringify_keys for label_tag
| * | fix destructive stringify_keys for label_tagWaynn Lue2011-08-112-2/+8
| | |
* | | Merge pull request #2563 from bogdan/internal_validationJosé Valim2011-08-2515-8/+83
|\ \ \ | |_|/ |/| | Implemented strict validation concept
| * | Typo fixBogdan Gusiev2011-08-251-1/+1
| | |
| * | Add change log entry on strict validationBogdan Gusiev2011-08-241-0/+2
| | |
| * | Add strict validation example to guidesBogdan Gusiev2011-08-242-2/+6
| | |
| * | Implemented strict validation conceptBogdan Gusiev2011-08-1712-6/+75
| | | | | | | | | | | | | | | | | | | | | In order to deliver debug information to dev team instead of display error message to end user Implemented strict validation concept that suppose to define validation that always raise exception when fails
* | | fix ambiguous * and remove unused variableAaron Patterson2011-08-241-2/+2
| | |
* | | fix ambiguous use of *Aaron Patterson2011-08-241-1/+1
| | |
* | | stop circular require warningsAaron Patterson2011-08-243-3/+0
| | |
* | | only backport the to_d method if it does not existAaron Patterson2011-08-241-2/+5
| | |
* | | 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
| | |
* | | Merge pull request #2679 from amatsuda/nullify_abstract_class_table_nameAaron Patterson2011-08-242-0/+6
|\ \ \ | | | | | | | | do not compute table names for abstract classes
| * | | do not compute table names for abstract classesAkira Matsuda2011-08-242-0/+6
| | | |
* | | | the command line guide is good to goXavier Noria2011-08-241-1/+1
| | | |