aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
* | | 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 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 pluginJoshua Peek2012-10-157-136/+61
| |/ / /
* | | | Add more CHANGELOG entries from #7927Rafael Mendonça França2012-10-172-2/+5
* | | | Add CHANGELOG entry for #7927Rafael Mendonça França2012-10-173-11/+9
* | | | 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
* | | | 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.Scott Willson2012-10-163-2/+16
|/ / /
* | | Merge pull request #7371 from csmuc/fix_dup_validation_errorsSantiago Pastorino2012-10-163-0/+20
|\ \ \
| * | | Call super to nullify the reference to the original errors object in the dup'...Christian Seiler2012-10-163-0/+20
* | | | Merge pull request #7963 from arunagw/redcarpet_not_for_jrubyCarlos Antonio da Silva2012-10-161-1/+1
|\ \ \ \
| * | | | 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
* | | | | Merge pull request #7958 from mattdbridges/rails-guides-active-support-additionSantiago Pastorino2012-10-151-0/+4
|\ \ \ \ \
| * | | | | Adding reference a few Time and Date aliasesMatt Bridges2012-10-151-0/+4
|/ / / / /
* | | | | 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, 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 appending extensions and computi...Joshua Peek2012-10-152-2/+21
* | | | | buckets hash isn't public, so use symbol keys to avoid stringAaron Patterson2012-10-151-8/+8
* | | | | Move two hotspots to use Hash[] rather than Hash#dupAaron Patterson2012-10-151-3/+5
|/ / / /
* | | | Merge pull request #7927 from josh/asset-path-helperRafael Mendonça França2012-10-1511-505/+289
|\ \ \ \
| * | | | 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
| * | | | Use sprockets-rails branch for nowJoshua Peek2012-10-151-2/+2
| * | | | Merge branch 'master' into asset-path-helperJoshua Peek2012-10-15123-626/+681
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | ruby-prof isn't compatible with ruby trunk after 36925Jeremy Kemper2012-10-151-2/+2
* | | | | Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanupSantiago Pastorino2012-10-151-4/+0
|\ \ \ \ \
| * | | | | Removed useless "extend SanitizeHelper::ClassMethods"Andrey Samsonov2012-10-151-4/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #7952 from ayrton/minor_cleanupSantiago Pastorino2012-10-151-5/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Minor cleanup, helper method was only used onceAyrton De Craene2012-10-151-5/+1
|/ / / /
* | | | Merge pull request #7947 from acapilleri/uniqueness_validateRafael Mendonça França2012-10-141-1/+2
|\ \ \ \
| * | | | refactoring of uniqueness validate_eachAngelo Capilleri2012-10-141-1/+2
|/ / / /
* | | | Merge pull request #7942 from IPGlider/masterRafael Mendonça França2012-10-142-1/+14
|\ \ \ \
| * | | | Fix typo in inet and cidr savingMiguel Herranz2012-10-142-1/+14
* | | | | Fix typo in #7941Jeremy Kemper2012-10-141-1/+1