aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* prefer composition over inheritenceAaron Patterson2012-10-182-11/+31
|
* fix assertionsAaron Patterson2012-10-181-2/+2
|
* Make DescendantsTracker thread safe and optimize the #descendants method.thedarkone2012-10-183-30/+51
|
* some ruby interpreters don't have ruby-prof so just skip the testsAaron Patterson2012-10-182-4/+13
| | | | rather than exiting the process.
* Merge pull request #7975 from butcher/extend_date_select_helper_functionalityRafael Mendonça França2012-10-183-0/+24
|\ | | | | | | | | | | | | Extend date_select helper functionality. Conflicts: actionpack/CHANGELOG.md
| * Extend date_select helper functionality.Pavel Nikitin2012-10-183-0/+22
| |
* | Remove warning setting eager_loadRafael Mendonça França2012-10-181-0/+1
| |
* | Don't use action_controller.perform_caching to enable rack-rack.Rafael Mendonça França2012-10-183-7/+14
| | | | | | | | | | Setting the action_dispatch.rack_cache options to true or a hash should be the way to enable it.
* | Fix the app_generator and plugin_new testsRafael Mendonça França2012-10-182-1/+4
| |
* | Merge pull request #7990 from mrbrdo/masterRafael Mendonça França2012-10-181-1/+1
|\ \ | | | | | | Credit for previous commit [ci skip]
| * | add credit to committer of pull request #6569Jan Berdajs2012-10-181-1/+1
|/ /
* | Merge pull request #7969 from ↵Rafael Mendonça França2012-10-181-5/+6
|\ \ | | | | | | | | | | | | senny/active_model_validations_requires_necessary_files active_model/validations requires necessary files to run
| * | active_model/validations requires necessary files to runYves Senn2012-10-181-0/+1
| | |
| * | cleanup, replace non-breaking spaces with spacesYves Senn2012-10-181-5/+5
|/ /
* | Now the Sprockets railtie lives in sprockets/railtieRafael Mendonça França2012-10-184-4/+4
| |
* | Permit string and float values in the multiparameter attributesRafael Mendonça França2012-10-182-10/+15
| |
* | Typecast to string and array are not supported in multiparameterRafael Mendonça França2012-10-181-3/+2
| | | | | | | | attributes
* | Change back to official sprockets-railsJoshua Peek2012-10-172-3/+3
| |
* | Add changelog entry for precompile configJoshua Peek2012-10-171-0/+4
| |
* | Merge pull request #7968 from josh/only-precompile-app-assets-by-defaultRafael Mendonça França2012-10-171-1/+1
|\ \ | | | | | | Only compile non-js/css under app/assets by default
| * | Only compile non-js/css under app/assets by defaultJoshua Peek2012-10-161-1/+1
| | |
* | | Merge pull request #7964 from josh/josh-sprockets-railsRafael Mendonça França2012-10-177-136/+61
|\ \ \ | | | | | | | | Switch to new sprockets-rails plugin
| * | | Switch to new sprockets-rails pluginJoshua Peek2012-10-157-136/+61
| |/ /
* | | Add more CHANGELOG entries from #7927Rafael Mendonça França2012-10-172-2/+5
| | | | | | | | | | | | | | | | | | Also remove references for RAILS_ASSET_ID from the guides [ci skip]
* | | Add CHANGELOG entry for #7927Rafael Mendonça França2012-10-173-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 Patterson2012-10-171-2/+2
| | |
* | | use columns hash to look up the column for the count fieldAaron Patterson2012-10-172-14/+7
| | |
* | | fix Digestor to be thread safe.Aaron Patterson2012-10-171-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 Patterson2012-10-171-5/+9
| | |
* | | Merge pull request #7972 from scottwillson/fix-double-presence-of-errors-2José Valim2012-10-173-2/+16
|\ \ \ | |_|/ |/| | Fix bug with presence validation of associations.
| * | Fix bug with presence validation of associations.Scott Willson2012-10-163-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_errorsSantiago Pastorino2012-10-163-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 Seiler2012-10-163-0/+20
| | | | | | | | | | | | dup'ed object (call ActiveModel::Validations#initialize_dup). Closes #7291
* | | Merge pull request #7963 from arunagw/redcarpet_not_for_jrubyCarlos Antonio da Silva2012-10-161-1/+1
|\ \ \ | | | | | | | | Add :platform to redcarpet gem, pointing to :ruby only.
| * | | redcarpet gem will not work with JRuby!Arun Agrawal2012-10-161-1/+1
| | | |
* | | | Revert "remove unnecessary object/conversions file"Xavier Noria2012-10-164-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-additionSantiago Pastorino2012-10-151-0/+4
|\ \ \ \ | | | | | | | | | | Adding reference a few Time and Date aliases in Rails 4.0 release notes
| * | | | Adding reference a few Time and Date aliasesMatt Bridges2012-10-151-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 Silva2012-10-151-6/+6
| | | |
* | | | Merge pull request #7439 from featurist/masterAaron Patterson2012-10-153-1/+10
|\ \ \ \ | | | | | | | | | | ActiveRecord: sum expression returns string '0' for no records, fixed
| * | | | ActiveRecord: sum expression returns string '0' for no records, fixedTim Macfarlane2012-10-153-1/+10
|/ / / /
* | | / use `setup` for setting up the testAaron Patterson2012-10-151-5/+1
| |_|/ |/| |
* | | Merge pull request #7956 from josh/ignore-asset-url-query-or-anchorRafael Mendonça França2012-10-152-2/+21
|\ \ \ | | | | | | | | Ignore asset url query string or anchor when generating path
| * | | Ignore asset url query string or anchor when appending extensions and ↵Joshua Peek2012-10-152-2/+21
| | | | | | | | | | | | | | | | computing public path
* | | | buckets hash isn't public, so use symbol keys to avoid stringAaron Patterson2012-10-151-8/+8
| | | | | | | | | | | | | | | | allocations
* | | | Move two hotspots to use Hash[] rather than Hash#dupAaron Patterson2012-10-151-3/+5
|/ / / | | | | | | | | | https://bugs.ruby-lang.org/issues/7166
* | | Merge pull request #7927 from josh/asset-path-helperRafael Mendonça França2012-10-1511-505/+289
|\ \ \ | | | | | | | | Refactor AssetUrlHelper
| * | | Use sprockets-rails masterJoshua Peek2012-10-152-3/+3
| | | |
| * | | Extract compute_asset_extname and allow extname to be disabledJoshua Peek2012-10-152-13/+30
| | | |
| * | | Sprockets-rails branchJoshua Peek2012-10-151-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 12:54:46 +0000