aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3136 from guilleiguaran/clear-digests-on-precompileSantiago Pastorino2011-09-262-0/+22
| | | | Avoid use of existing precompiled assets during rake assets:precompile run
* Copy assets to nondigested filenames tooSantiago Pastorino2011-09-262-5/+11
|
* Merge pull request #3030 from htanata/fix_habtm_select_query_methodJon Leighton2011-09-263-4/+16
| | | | Fix: habtm doesn't respect select query method
* Just assert_equal hereSantiago Pastorino2011-09-261-1/+1
|
* Merge pull request #3135 from christos/respect_assets_digest_valueSantiago Pastorino2011-09-262-1/+9
|\ | | | | Give precedence to `config.digest = false` over the existence of manifest.yml asset digests
| * Give precedence to `config.digest = false` over manifest.yml asset digestsChristos Zisopoulos2011-09-262-1/+9
| |
* | Fix belongs_to polymorphic with custom primary key on target.Jon Leighton2011-09-265-18/+30
| | | | | | | | Closes #3104.
* | Encapsulate assets initialization in its own rake task.José Valim2011-09-261-3/+7
| |
* | image_tag should use /assets if asset pipelining is turned on. Closes #3126Santiago Pastorino2011-09-262-0/+8
|/
* Make serializable_hash take attr values directly from attributes hash.Jon Leighton2011-09-263-4/+23
| | | | | | | | | | | | Previously, it would use send() to get the attribute. In Active Resource, this would rely on hitting method missing. If a method with the same name was defined further up the ancestor chain, that method would wrongly be called. This change fixes test_to_xml_with_private_method_name_as_attribute in activeresource/test/cases/base_test.rb, which was broken after 51bef9d8fb0b4da7a104425ab8545e9331387743, because that change made to_xml use serializable_hash.
* CollectionProxy#replace should change the DB records rather than just ↵Jon Leighton2011-09-262-1/+12
| | | | mutating the array. Fixes #3020.
* fix deprecation warning in cookie_store_testVijay Dev2011-09-251-1/+1
| | | | The options argument to MessageVerifier#initialize should be a hash.
* Merge pull request #3125 from dolzenko/masterJosé Valim2011-09-252-0/+6
|\ | | | | Implement Mime::Type#respond_to? (consistently with #method_missing) Closes #3032
| * Implement Mime::Type#respond_to? (consistently with #method_missing)Evgeniy Dolzhenko2011-09-252-0/+6
|/
* 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)