Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Permit string and float values in the multiparameter attributes | Rafael Mendonça França | 2012-10-18 | 2 | -10/+15 |
| | |||||
* | Typecast to string and array are not supported in multiparameter | Rafael Mendonça França | 2012-10-18 | 1 | -3/+2 |
| | | | | attributes | ||||
* | Change back to official sprockets-rails | Joshua Peek | 2012-10-17 | 2 | -3/+3 |
| | |||||
* | Add changelog entry for precompile config | Joshua Peek | 2012-10-17 | 1 | -0/+4 |
| | |||||
* | Merge pull request #7968 from josh/only-precompile-app-assets-by-default | Rafael Mendonça França | 2012-10-17 | 1 | -1/+1 |
|\ | | | | | Only compile non-js/css under app/assets by default | ||||
| * | Only compile non-js/css under app/assets by default | Joshua Peek | 2012-10-16 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #7964 from josh/josh-sprockets-rails | Rafael Mendonça França | 2012-10-17 | 7 | -136/+61 |
|\ \ | | | | | | | Switch to new sprockets-rails plugin | ||||
| * | | Switch to new sprockets-rails plugin | Joshua Peek | 2012-10-15 | 7 | -136/+61 |
| |/ | |||||
* | | Add more CHANGELOG entries from #7927 | Rafael Mendonça França | 2012-10-17 | 2 | -2/+5 |
| | | | | | | | | | | | | Also remove references for RAILS_ASSET_ID from the guides [ci skip] | ||||
* | | Add CHANGELOG entry for #7927 | Rafael Mendonça França | 2012-10-17 | 3 | -11/+9 |
| | | | | | | | | | | | | | | Removed the asset_path configuration from the guides and added an entry in the upgrading_ruby_on_rails guide [ci skip] | ||||
* | | remove unused variables. Oops! | Aaron Patterson | 2012-10-17 | 1 | -2/+2 |
| | | |||||
* | | use columns hash to look up the column for the count field | Aaron Patterson | 2012-10-17 | 2 | -14/+7 |
| | | |||||
* | | fix Digestor to be thread safe. | Aaron Patterson | 2012-10-17 | 1 | -8/+30 |
| | | | | | | | | | | Add a lock on the cache so that we don't have concurrency issues when calculating the cache. | ||||
* | | use the tmp filesystem rather than our own thing. | Aaron Patterson | 2012-10-17 | 1 | -5/+9 |
| | | |||||
* | | Merge pull request #7972 from scottwillson/fix-double-presence-of-errors-2 | José Valim | 2012-10-17 | 3 | -2/+16 |
|\ \ | | | | | | | Fix bug with presence validation of associations. | ||||
| * | | Fix bug with presence validation of associations. | Scott Willson | 2012-10-16 | 3 | -2/+16 |
|/ / | | | | | | | Would incorrectly add duplicated errors when the association was blank. Bug introduced in 1fab518c6a75dac5773654646eb724a59741bc13. | ||||
* | | Merge pull request #7371 from csmuc/fix_dup_validation_errors | Santiago Pastorino | 2012-10-16 | 3 | -0/+20 |
|\ \ | | | | | | | Dup'ed ActiveRecord objects may not share the errors object | ||||
| * | | Call super to nullify the reference to the original errors object in the ↵ | Christian Seiler | 2012-10-16 | 3 | -0/+20 |
| | | | | | | | | | | | | dup'ed object (call ActiveModel::Validations#initialize_dup). Closes #7291 | ||||
* | | | Merge pull request #7963 from arunagw/redcarpet_not_for_jruby | Carlos Antonio da Silva | 2012-10-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Add :platform to redcarpet gem, pointing to :ruby only. | ||||
| * | | | redcarpet gem will not work with JRuby! | Arun Agrawal | 2012-10-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Revert "remove unnecessary object/conversions file" | Xavier Noria | 2012-10-16 | 4 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is used at least by Active Merchant, its existence is maybe not necessary but no big deal either. This reverts commit ae9b3d7cecd77b9ace38671b183e1a360bf632b6. | ||||
* | | | | Merge pull request #7958 from mattdbridges/rails-guides-active-support-addition | Santiago Pastorino | 2012-10-15 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | Adding reference a few Time and Date aliases in Rails 4.0 release notes | ||||
| * | | | | Adding reference a few Time and Date aliases | Matt Bridges | 2012-10-15 | 1 | -0/+4 |
|/ / / / | | | | | | | | | | | | | | | | | I originally contributed these aliases 10 months ago and just never got it added to the Rails 4.0 release notes. Here they are. | ||||
* | | | | Move changelog entry from #7439 to the top [ci skip] | Carlos Antonio da Silva | 2012-10-15 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #7439 from featurist/master | Aaron Patterson | 2012-10-15 | 3 | -1/+10 |
|\ \ \ \ | | | | | | | | | | | ActiveRecord: sum expression returns string '0' for no records, fixed | ||||
| * | | | | ActiveRecord: sum expression returns string '0' for no records, fixed | Tim Macfarlane | 2012-10-15 | 3 | -1/+10 |
|/ / / / | |||||
* | | / | use `setup` for setting up the test | Aaron Patterson | 2012-10-15 | 1 | -5/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #7956 from josh/ignore-asset-url-query-or-anchor | Rafael Mendonça França | 2012-10-15 | 2 | -2/+21 |
|\ \ \ | | | | | | | | | Ignore asset url query string or anchor when generating path | ||||
| * | | | Ignore asset url query string or anchor when appending extensions and ↵ | Joshua Peek | 2012-10-15 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | | computing public path | ||||
* | | | | buckets hash isn't public, so use symbol keys to avoid string | Aaron Patterson | 2012-10-15 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | allocations | ||||
* | | | | Move two hotspots to use Hash[] rather than Hash#dup | Aaron Patterson | 2012-10-15 | 1 | -3/+5 |
|/ / / | | | | | | | | | | https://bugs.ruby-lang.org/issues/7166 | ||||
* | | | Merge pull request #7927 from josh/asset-path-helper | Rafael Mendonça França | 2012-10-15 | 11 | -505/+289 |
|\ \ \ | | | | | | | | | Refactor AssetUrlHelper | ||||
| * | | | Use sprockets-rails master | Joshua Peek | 2012-10-15 | 2 | -3/+3 |
| | | | | |||||
| * | | | Extract compute_asset_extname and allow extname to be disabled | Joshua Peek | 2012-10-15 | 2 | -13/+30 |
| | | | | |||||
| * | | | Sprockets-rails branch | Joshua Peek | 2012-10-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use sprockets-rails branch for now | Joshua Peek | 2012-10-15 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into asset-path-helper | Joshua Peek | 2012-10-15 | 123 | -626/+681 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb | ||||
* | | | | ruby-prof isn't compatible with ruby trunk after 36925 | Jeremy Kemper | 2012-10-15 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanup | Santiago Pastorino | 2012-10-15 | 1 | -4/+0 |
|\ \ \ \ | | | | | | | | | | | Removed useless "extend SanitizeHelper::ClassMethods" | ||||
| * | | | | Removed useless "extend SanitizeHelper::ClassMethods" | Andrey Samsonov | 2012-10-15 | 1 | -4/+0 |
| | |/ / | |/| | | | | | | | | | | | | | | Since SanitizeHelper includes ActiveSupport::Concern, extending of it ClassMethods is no needed. | ||||
* | | | | Merge pull request #7952 from ayrton/minor_cleanup | Santiago Pastorino | 2012-10-15 | 1 | -5/+1 |
|\ \ \ \ | |/ / / |/| | | | Minor cleanup, helper method was only used once | ||||
| * | | | Minor cleanup, helper method was only used once | Ayrton De Craene | 2012-10-15 | 1 | -5/+1 |
|/ / / | |||||
* | | | Merge pull request #7947 from acapilleri/uniqueness_validate | Rafael Mendonça França | 2012-10-14 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | refactoring of uniqueness validate_each | ||||
| * | | | refactoring of uniqueness validate_each | Angelo Capilleri | 2012-10-14 | 1 | -1/+2 |
|/ / / | | | | | | | | | | get scope_value only one time dependig on reflection | ||||
* | | | Merge pull request #7942 from IPGlider/master | Rafael Mendonça França | 2012-10-14 | 2 | -1/+14 |
|\ \ \ | | | | | | | | | Fix typo in inet and cidr saving | ||||
| * | | | Fix typo in inet and cidr saving | Miguel Herranz | 2012-10-14 | 2 | -1/+14 |
| | | | | |||||
* | | | | Fix typo in #7941 | Jeremy Kemper | 2012-10-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now. | Jeremy Kemper | 2012-10-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #7941 from robin850/master | Jeremy Kemper | 2012-10-14 | 94 | -447/+447 |
|\ \ \ \ | | | | | | | | | | | Use 1.9 Hash syntax in railties | ||||
| * | | | | Use Ruby 1.9 Hash syntax in railties | Robin Dupret | 2012-10-14 | 94 | -447/+447 |
| | | | | |