aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #3124 from avakhov/patch-6-stylesheet-linkJosé Valim2011-09-252-1/+5
|\ \ | | | | | | escape options for the stylesheet_link_tag method
| * | escape options for the stylesheet_link_tag methodAlexey Vakhov2011-09-252-1/+5
| | |
* | | Merge pull request #2246 from guilleiguaran/sprockets-compressors-apiJosé Valim2011-09-254-31/+79
|\ \ \ | |/ / |/| | Public API for add new compressors to Sprockets
| * | Add public API for register new js and css compressors for SprocketsGuillermo Iguaran2011-09-244-31/+79
|/ /
* | Merge pull request #3123 from avakhov/patch-5-remove-superfluous-to-sSantiago Pastorino2011-09-241-1/+1
|\ \ | | | | | | remove superfluous to_s in ERB::Util.html_escape
| * | remove superfluous to_s in ERB::Util.html_escapeAlexey Vakhov2011-09-241-1/+1
| | |
* | | Merge pull request #3121 from cablegram/3-1-stableSantiago Pastorino2011-09-241-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 Pastorino2011-09-242-10/+9
|/ / | | | | | | This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd.
* | Avoid using pathnames and automatically create the manifest directory if one ↵José Valim2011-09-243-9/+11
| | | | | | | | does not exist yet.
* | Add test for belongs_to? and group initializers.José Valim2011-09-241-2/+9
| |
* | Remove the ENV flag, yagni.José Valim2011-09-242-13/+0
| |
* | `rake assets:precompile` loads the application but does not initialize it.José Valim2011-09-2411-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-helpersSantiago Pastorino2011-09-231-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 Iguaran2011-09-231-5/+0
|/ / | | | | | | directly
* | Merge pull request #3114 from zenprogrammer/fix_constantize_docJosé Valim2011-09-231-3/+3
|\ \ | | | | | | Minor doc fix to String#constantize
| * | Minor doc fix to String#constantizeRyan Oblak2011-09-231-3/+3
|/ /
* | Merge pull request #3092 from asee/masterSantiago Pastorino2011-09-232-1/+11
|\ \ | | | | | | Sprockets to use config.assets.prefix, with tests
| * | Fixes #1489 again, with updated code and numerous tests to confirmdocunext2011-09-222-1/+11
| |/
* | Update CHANGELOG for safe_constantize.José Valim2011-09-232-1/+6
| |
* | Use safe_constantize where possible.José Valim2011-09-233-12/+5
| |
* | Ensure that constantize just rescues NameError that applies to the constant ↵José Valim2011-09-232-4/+26
| | | | | | | | being currently loaded.
* | Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; ↵Ryan Oblak2011-09-235-21/+106
| | | | | | | | refactored common constantize tests into ConstantizeTestCases
* | Update CHANGELOG.José Valim2011-09-231-0/+8
| |
* | Fix failing tests and add tests for :formats on partial.José Valim2011-09-231-5/+10
| |
* | Using #extract_details in PartialRenderer, too!Nick Sutterer2011-09-232-3/+1
| |
* | Allow both sym and array for details options in #render. using ↵Nick Sutterer2011-09-233-2/+16
| | | | | | | | LC#registered_details to extract options.
* | added tests for render :file/:template and the :formats/:handlers/:locale ↵Nick Sutterer2011-09-233-1/+19
| | | | | | | | options.
* | Refactor AMo as_json.José Valim2011-09-231-9/+5
| |
* | Merge pull request #3106 from mattetti/masterJosé Valim2011-09-222-12/+20
|\ \ | | | | | | ActiveModel JSON serialization bug fix
| * | fixed a bug with the json serialization when the class setting is set to not ↵Matt Aimonetti2011-09-222-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 precompilingTerence Lee2011-09-222-0/+12
| | |
* | | AR wants sqlite3 1.3.4Terence Lee2011-09-221-1/+1
| | |
* | | No need to create a range objectSantiago Pastorino2011-09-221-3/+3
| | |
* | | Merge pull request #3096 from phuibonhoa/masterSantiago Pastorino2011-09-222-10/+18
|\ \ \ | | | | | | | | FileStore key_file_path does not properly limit filenames to 255 characters
| * | | Updated existing test that fails with this fix ↵Philippe Huibonhoa2011-09-211-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 Huibonhoa2011-09-212-9/+17
| | | | | | | | | | | | | | | | for the file system. (https://github.com/rails/rails/issues/3072)
* | | | Deprecate passing the template handler in the template name.José Valim2011-09-2213-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é Valim2011-09-221-6/+3
| | | |
* | | | Get rid of update_details in favor of passing details to find_template.José Valim2011-09-2210-86/+50
| | | |
* | | | it is now possible to pass details options (:formats, :details, :locales, ↵Nick Sutterer2011-09-225-10/+27
| | | | | | | | | | | | | | | | ...) to #render, #find_template and friends. this doesn't change anything in global context.
* | | | Add rake test:template.Nick Sutterer2011-09-221-0/+5
| | | |
* | | | No need to recalculate the @details_key after update_details.José Valim2011-09-221-3/+2
| | | |
* | | | Merge pull request #3099 from wrozka/masterJosé Valim2011-09-222-3/+15
|\ \ \ \ | | | | | | | | | | Named routes are modifying passed options
| * | | | Fix named routes modifying argumentsPawel Pierzchala2011-09-222-3/+15
|/ / / /
* | | | Merge pull request #3027 from alex3/assets-precompile-regex-fixSantiago Pastorino2011-09-212-1/+10
|\ \ \ \ | | | | | | | | | | Default precompile regex was erroneously matching files
| * | | | Default precompile regexp that properly matches application.js and ↵Alex Yakoubian2011-09-162-1/+10
| | | | | | | | | | | | | | | | | | | | application.css
* | | | | Merge pull request #3081 from guilleiguaran/move-precompile-to-classSantiago Pastorino2011-09-213-22/+56
|\ \ \ \ \ | | | | | | | | | | | | Move precompiling from task to Sprockets::StaticCompiler
| * | | | | Move precompile task to Sprockets::StaticCompilerGuillermo Iguaran2011-09-203-22/+56
| | | | | |
* | | | | | Add jquery-rails to Gemfile of plugins, test/dummy app uses it.Santiago Pastorino2011-09-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Closes #3091
* | | | | | Slightly reorganize lookup context modules in order to better isolate cache ↵José Valim2011-09-211-100/+111
| |_|_|/ / |/| | | | | | | | | | | | | | responsibilities.