Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #3121 from cablegram/3-1-stable | Santiago Pastorino | 2011-09-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows | |||||
* | | | Revert "Make process reuse the env var passed as argument" | Santiago Pastorino | 2011-09-24 | 2 | -10/+9 | |
|/ / | | | | | | | This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd. | |||||
* | | Avoid using pathnames and automatically create the manifest directory if one ↵ | José Valim | 2011-09-24 | 3 | -9/+11 | |
| | | | | | | | | does not exist yet. | |||||
* | | Add test for belongs_to? and group initializers. | José Valim | 2011-09-24 | 1 | -2/+9 | |
| | | ||||||
* | | Remove the ENV flag, yagni. | José Valim | 2011-09-24 | 2 | -13/+0 | |
| | | ||||||
* | | `rake assets:precompile` loads the application but does not initialize it. | José Valim | 2011-09-24 | 11 | -110/+183 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | To the app developer, this means configuration add in config/initializers/* will not be executed. Plugins developers need to special case their initializers that are meant to be run in the assets group by adding :group => :assets. Conflicts: railties/CHANGELOG railties/test/application/assets_test.rb | |||||
* | | Merge pull request #3115 from guilleiguaran/refactor-rails-helpers | Santiago Pastorino | 2011-09-23 | 1 | -5/+0 | |
|\ \ | | | | | | | Remove Sprockets compute_public_path, AV compute_plubic_path can be used | |||||
| * | | Remove Sprockets compute_public_path, AV compute_public_path can be used ↵ | Guillermo Iguaran | 2011-09-23 | 1 | -5/+0 | |
|/ / | | | | | | | directly | |||||
* | | Merge pull request #3114 from zenprogrammer/fix_constantize_doc | José Valim | 2011-09-23 | 1 | -3/+3 | |
|\ \ | | | | | | | Minor doc fix to String#constantize | |||||
| * | | Minor doc fix to String#constantize | Ryan Oblak | 2011-09-23 | 1 | -3/+3 | |
|/ / | ||||||
* | | Merge pull request #3092 from asee/master | Santiago Pastorino | 2011-09-23 | 2 | -1/+11 | |
|\ \ | | | | | | | Sprockets to use config.assets.prefix, with tests | |||||
| * | | Fixes #1489 again, with updated code and numerous tests to confirm | docunext | 2011-09-22 | 2 | -1/+11 | |
| |/ | ||||||
* | | Update CHANGELOG for safe_constantize. | José Valim | 2011-09-23 | 2 | -1/+6 | |
| | | ||||||
* | | Use safe_constantize where possible. | José Valim | 2011-09-23 | 3 | -12/+5 | |
| | | ||||||
* | | Ensure that constantize just rescues NameError that applies to the constant ↵ | José Valim | 2011-09-23 | 2 | -4/+26 | |
| | | | | | | | | being currently loaded. | |||||
* | | Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; ↵ | Ryan Oblak | 2011-09-23 | 5 | -21/+106 | |
| | | | | | | | | refactored common constantize tests into ConstantizeTestCases | |||||
* | | Update CHANGELOG. | José Valim | 2011-09-23 | 1 | -0/+8 | |
| | | ||||||
* | | Fix failing tests and add tests for :formats on partial. | José Valim | 2011-09-23 | 1 | -5/+10 | |
| | | ||||||
* | | Using #extract_details in PartialRenderer, too! | Nick Sutterer | 2011-09-23 | 2 | -3/+1 | |
| | | ||||||
* | | Allow both sym and array for details options in #render. using ↵ | Nick Sutterer | 2011-09-23 | 3 | -2/+16 | |
| | | | | | | | | LC#registered_details to extract options. | |||||
* | | added tests for render :file/:template and the :formats/:handlers/:locale ↵ | Nick Sutterer | 2011-09-23 | 3 | -1/+19 | |
| | | | | | | | | options. | |||||
* | | Refactor AMo as_json. | José Valim | 2011-09-23 | 1 | -9/+5 | |
| | | ||||||
* | | Merge pull request #3106 from mattetti/master | José Valim | 2011-09-22 | 2 | -12/+20 | |
|\ \ | | | | | | | ActiveModel JSON serialization bug fix | |||||
| * | | fixed a bug with the json serialization when the class setting is set to not ↵ | Matt Aimonetti | 2011-09-22 | 2 | -12/+20 | |
| | | | | | | | | | | | | include the root, but an instance is serialized with the root option passed as true | |||||
* | | | set env to let rails know we're precompiling | Terence Lee | 2011-09-22 | 2 | -0/+12 | |
| | | | ||||||
* | | | AR wants sqlite3 1.3.4 | Terence Lee | 2011-09-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | No need to create a range object | Santiago Pastorino | 2011-09-22 | 1 | -3/+3 | |
| | | | ||||||
* | | | Merge pull request #3096 from phuibonhoa/master | Santiago Pastorino | 2011-09-22 | 2 | -10/+18 | |
|\ \ \ | | | | | | | | | FileStore key_file_path does not properly limit filenames to 255 characters | |||||
| * | | | Updated existing test that fails with this fix ↵ | Philippe Huibonhoa | 2011-09-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | (8d63678d1406c5518d437709af0fde717c0248d7). Before the fix the test was giving a false positive, because file_store.key_file_path would return an empty filename (i.e. test/tmp_cache/4D0/F4D rather than test/tmp_cache/4D0/F4D/xxxx…). Even though the fix referenced above divides the filename into directories to prevent it from being too long, it seems that 1000 characters will always raise an error, so reducing the key size to 900). | |||||
| * | | | Fixed issue in file store where it could create a filename that was too long ↵ | Philippe Huibonhoa | 2011-09-21 | 2 | -9/+17 | |
| | | | | | | | | | | | | | | | | for the file system. (https://github.com/rails/rails/issues/3072) | |||||
* | | | | Deprecate passing the template handler in the template name. | José Valim | 2011-09-22 | 13 | -69/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | For example, calling hello.erb is now deprecated. Since Rails 3.0 passing the handler had no effect whatsover. This commit simply deprecates such cases so we can clean up the code in later releases. | |||||
* | | | | Make handlers a registered detail. | José Valim | 2011-09-22 | 1 | -6/+3 | |
| | | | | ||||||
* | | | | Get rid of update_details in favor of passing details to find_template. | José Valim | 2011-09-22 | 10 | -86/+50 | |
| | | | | ||||||
* | | | | it is now possible to pass details options (:formats, :details, :locales, ↵ | Nick Sutterer | 2011-09-22 | 5 | -10/+27 | |
| | | | | | | | | | | | | | | | | ...) to #render, #find_template and friends. this doesn't change anything in global context. | |||||
* | | | | Add rake test:template. | Nick Sutterer | 2011-09-22 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | No need to recalculate the @details_key after update_details. | José Valim | 2011-09-22 | 1 | -3/+2 | |
| | | | | ||||||
* | | | | Merge pull request #3099 from wrozka/master | José Valim | 2011-09-22 | 2 | -3/+15 | |
|\ \ \ \ | | | | | | | | | | | Named routes are modifying passed options | |||||
| * | | | | Fix named routes modifying arguments | Pawel Pierzchala | 2011-09-22 | 2 | -3/+15 | |
|/ / / / | ||||||
* | | | | Merge pull request #3027 from alex3/assets-precompile-regex-fix | Santiago Pastorino | 2011-09-21 | 2 | -1/+10 | |
|\ \ \ \ | | | | | | | | | | | Default precompile regex was erroneously matching files | |||||
| * | | | | Default precompile regexp that properly matches application.js and ↵ | Alex Yakoubian | 2011-09-16 | 2 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | application.css | |||||
* | | | | | Merge pull request #3081 from guilleiguaran/move-precompile-to-class | Santiago Pastorino | 2011-09-21 | 3 | -22/+56 | |
|\ \ \ \ \ | | | | | | | | | | | | | Move precompiling from task to Sprockets::StaticCompiler | |||||
| * | | | | | Move precompile task to Sprockets::StaticCompiler | Guillermo Iguaran | 2011-09-20 | 3 | -22/+56 | |
| | | | | | | ||||||
* | | | | | | Add jquery-rails to Gemfile of plugins, test/dummy app uses it. | Santiago Pastorino | 2011-09-21 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #3091 | |||||
* | | | | | | Slightly reorganize lookup context modules in order to better isolate cache ↵ | José Valim | 2011-09-21 | 1 | -100/+111 | |
| |_|_|/ / |/| | | | | | | | | | | | | | | responsibilities. | |||||
* | | | | | fix incorrect comment | Vijay Dev | 2011-09-22 | 1 | -1/+1 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-21 | 13 | -28/+100 | |
|\ \ \ \ | ||||||
| * | | | | Revert "add a missing "on" and remove the "endprologue" text" | Vijay Dev | 2011-09-21 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3c5340ec9cbf12d19e734289ba748186af492d60. Reason: endprologue should not have been removed. | |||||
| * | | | | indentation fixes | Vijay Dev | 2011-09-21 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | add a missing "on" and remove the "endprologue" text | Waynn Lue | 2011-09-21 | 1 | -3/+1 | |
| | | | | | ||||||
| * | | | | add a '.' to etc | Waynn Lue | 2011-09-21 | 1 | -1/+1 | |
| | | | | |