Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2724 from ↵ | Santiago Pastorino | 2011-08-28 | 1 | -2/+2 |
|\ | | | | | | | | | guilleiguaran/avoid-recursive-call-sprockets-helper Avoid extra recursive call in Sprockets helpers | ||||
| * | Avoid extra recursive call in Sprockets helpers | Guillermo Iguaran | 2011-08-28 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #2723 from guilleiguaran/3-1-0-changelogs | Santiago Pastorino | 2011-08-28 | 3 | -0/+27 |
| | | | | Update changelogs for Rails 3.1.0 | ||||
* | fixing typo | Aaron Patterson | 2011-08-28 | 1 | -1/+1 |
| | |||||
* | Bump rack-cache, rack-test, rack-mount and sprockets up | Santiago Pastorino | 2011-08-28 | 1 | -4/+4 |
| | |||||
* | clear and disable query cache when an exception is raised from called middleware | Aaron Patterson | 2011-08-28 | 2 | -1/+33 |
| | |||||
* | Merge pull request #2711 from dasch/patch-3 | Aaron Patterson | 2011-08-28 | 1 | -14/+3 |
|\ | | | | | Refactor ActionDispatch::Http::UploadedFile | ||||
| * | Refactor ActionDispatch::Http::UploadedFile | Daniel Schierbeck | 2011-08-28 | 1 | -14/+3 |
|/ | |||||
* | deletes spurious arrow | Xavier Noria | 2011-08-27 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2714 from vijaydev/docs | Santiago Pastorino | 2011-08-27 | 3 | -15/+19 |
|\ | | | | | doc fixes | ||||
| * | doc fixes | Vijay Dev | 2011-08-28 | 3 | -15/+19 |
|/ | |||||
* | use sdoc to generate the API | Xavier Noria | 2011-08-27 | 2 | -2/+4 |
| | |||||
* | stop messing with the load path, load path should be adjusted in the test task | Aaron Patterson | 2011-08-26 | 1 | -7/+0 |
| | |||||
* | Merge pull request #2702 from arunagw/removed_unused_var | Santiago Pastorino | 2011-08-26 | 1 | -1/+1 |
|\ | | | | | Removed Unused Variable. | ||||
| * | Removed Unused Variable. | Arun Agrawal | 2011-08-26 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2699 from guilleiguaran/fix-asset-debugging-test-1.8 | Aaron Patterson | 2011-08-25 | 1 | -1/+1 |
|\ | | | | | Fix failing asset debug test under 1.8 | ||||
| * | Fix failing asset debug test under 1.8 | Guillermo Iguaran | 2011-08-25 | 1 | -1/+1 |
|/ | |||||
* | Force binary data inserted for a string data type to utf-8 and log an | Aaron Patterson | 2011-08-25 | 2 | -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-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 | 7 | -194/+3 |
| | | | | | | | | Module#delegate | ||||
* | | Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpers | Santiago Pastorino | 2011-08-25 | 1 | -4/+4 |
|\ \ | | | | | | | Removing redundant stringify_keys in Sprockets helpers | ||||
| * | | Removing redundant stringify_keys in Sprockets helpers | Guillermo Iguaran | 2011-08-25 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #2695 from dasch/more-debug-assets | Aaron Patterson | 2011-08-25 | 1 | -3/+1 |
|\ \ \ | |/ / |/| | | Don't require a specific value for the ?debug flag | ||||
| * | | Don't require a specific value for the ?debug flag | Daniel Schierbeck | 2011-08-25 | 1 | -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 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 #2690 from dasch/pretty-debug-assets | Aaron Patterson | 2011-08-25 | 1 | -4/+4 |
|\ \ | | | | | | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable | ||||
| * | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable | Daniel Schierbeck | 2011-08-25 | 1 | -4/+4 |
| |/ | |||||
* | | 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. | ||||
* | | Merge pull request #2694 from bogdan/internal_validation | Santiago Pastorino | 2011-08-25 | 2 | -1/+1 |
|\ \ | | | | | | | Moved strict validation changelog entry to right place | ||||
| * | | Moved strict validation changelog entry to right place | Bogdan Gusiev | 2011-08-25 | 2 | -1/+1 |
|/ / | |||||
* | | Tiny refactor | Santiago Pastorino | 2011-08-25 | 1 | -4/+7 |
| | | |||||
* | | Merge pull request #2491 from waynn/fix_symbol | Santiago Pastorino | 2011-08-25 | 2 | -2/+8 |
|\ \ | | | | | | | fix destructive stringify_keys for label_tag | ||||
| * | | fix destructive stringify_keys for label_tag | Waynn Lue | 2011-08-11 | 2 | -2/+8 |
| | | | |||||
* | | | Merge pull request #2563 from bogdan/internal_validation | José Valim | 2011-08-25 | 15 | -8/+83 |
|\ \ \ | |_|/ |/| | | Implemented strict validation concept | ||||
| * | | Typo fix | Bogdan Gusiev | 2011-08-25 | 1 | -1/+1 |
| | | | |||||
| * | | Add change log entry on strict validation | Bogdan Gusiev | 2011-08-24 | 1 | -0/+2 |
| | | | |||||
| * | | Add strict validation example to guides | Bogdan Gusiev | 2011-08-24 | 2 | -2/+6 |
| | | | |||||
| * | | Implemented strict validation concept | Bogdan Gusiev | 2011-08-17 | 12 | -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 variable | Aaron Patterson | 2011-08-24 | 1 | -2/+2 |
| | | | |||||
* | | | fix ambiguous use of * | Aaron Patterson | 2011-08-24 | 1 | -1/+1 |
| | | | |||||
* | | | stop circular require warnings | Aaron Patterson | 2011-08-24 | 3 | -3/+0 |
| | | | |||||
* | | | only backport the to_d method if it does not exist | Aaron Patterson | 2011-08-24 | 1 | -2/+5 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | Merge pull request #2679 from amatsuda/nullify_abstract_class_table_name | Aaron Patterson | 2011-08-24 | 2 | -0/+6 |
|\ \ \ | | | | | | | | | do not compute table names for abstract classes | ||||
| * | | | do not compute table names for abstract classes | Akira Matsuda | 2011-08-24 | 2 | -0/+6 |
| | | | | |||||
* | | | | the command line guide is good to go | Xavier Noria | 2011-08-24 | 1 | -1/+1 |
| | | | |