Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
* | | | | Merge pull request #2674 from masterkain/master | Jon Leighton | 2011-08-24 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Add back autoload :Table | ||||
| * | | | | Adding missing autoload | Claudio Poli | 2011-08-24 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2677 from guilleiguaran/refactor-sprockets-helpers | Santiago Pastorino | 2011-08-24 | 1 | -19/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Refactoring javascript_include_tag and stylesheet_link_tag Sprockets helpers | ||||
| * | | | | | Preserve stylesheet_link_tag and javascript_include_tag options on debug | Guillermo Iguaran | 2011-08-24 | 1 | -4/+3 |
| | | | | | | |||||
| * | | | | | Use super in javascript_include_tag and stylesheet_link_tag instead of ↵ | Guillermo Iguaran | 2011-08-24 | 1 | -14/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | generate tags manually | ||||
| * | | | | | Remove redundant join and call to html_safe | Guillermo Iguaran | 2011-08-24 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | bumping bcrypt-ruby requirement | Aaron Patterson | 2011-08-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | dealing with some -w warnings on startup | Aaron Patterson | 2011-08-24 | 5 | -2/+11 |
| | | | | | |||||
* | | | | | Merge pull request #2675 from jdelStrother/load_once_pathnames_fix | José Valim | 2011-08-24 | 2 | -1/+20 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix autoload_once_paths when using Pathnames & ruby 1.9 | ||||
| * | | | | Fix autoload_once_paths when using Pathnames & ruby 1.9 | Jonathan del Strother | 2011-08-24 | 2 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under ruby 1.9.2 - "/var/log".starts_with?(Pathname.new("/var")) # => false so setting config.autoload_once_paths with Pathnames would not work | ||||
* | | | | | Revert "Simplify JavaScriptHelper#escape_javascript" | Santiago Pastorino | 2011-08-24 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit broke the build without any improvement. This reverts commit eb0b71478ad4c37fdc4ec77bf2cf7c6b65dd36c4. | ||||
* | | | | | Bring in sprockets precompile task | Joshua Peek | 2011-08-24 | 1 | -3/+26 |
|/ / / / | |||||
* | | | | Merge pull request #2644 from guilleiguaran/allow-assets-debugging | Santiago Pastorino | 2011-08-24 | 6 | -9/+61 |
|\ \ \ \ | | | | | | | | | | | Add config.allow_debugging option | ||||
| * | | | | Add config.allow_debugging option to determine if the debug_assets query ↵ | Guillermo Iguaran | 2011-08-24 | 6 | -9/+61 |
| | | | | | | | | | | | | | | | | | | | | param can be passed by user | ||||
* | | | | | Merge pull request #2668 from guilleiguaran/debug-assets-media-type | Santiago Pastorino | 2011-08-24 | 2 | -2/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | Debug assets shouldn't ignore media type for stylesheets. Closes #2625 | ||||
| * | | | | Debug assets shouldn't ignore media type for stylesheets. Closes #2625 | Guillermo Iguaran | 2011-08-23 | 2 | -2/+6 |
| | | | | | |||||
* | | | | | 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. | ||||
* | | | | | | Merge pull request #2647 from dmathieu/no_rescue | Santiago Pastorino | 2011-08-24 | 2 | -7/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove useless rescue | ||||
| * | | | | | | remove useless rescue | Damien Mathieu | 2011-08-24 | 2 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | params is a method, defined in every controller, which always returns a hash. If it raises a NoMethodError, it means there's a bug somewhere else, which we want to know about. | ||||
* | | | | | | | Merge pull request #2669 from BMorearty/remove-extra-word | Santiago Pastorino | 2011-08-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | docs: Remove extra word from sentence in initialization guide. | ||||
| * | | | | | | Remove extra word from sentence in initialization guide. | Brian Morearty | 2011-08-23 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* / | | | | | Simplify JavaScriptHelper#escape_javascript | Daniel Schierbeck | 2011-08-24 | 1 | -7/+6 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Use the Linus-style conditional. Also fix the documentation slightly. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
* | | | | | `load` should also return the value from `super` | Aaron Patterson | 2011-08-23 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | require needs to return true or false. thank you Ryan "zenspider" Davis | Aaron Patterson | 2011-08-23 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #2607 from guilleiguaran/add-rbenv-gitignore | David Heinemeier Hansson | 2011-08-23 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Add .rbenv-version to .gitignore |