Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
* | | | | | Add CHANGELOG entry for #7927 | Rafael Mendonça França | 2012-10-17 | 3 | -11/+9 | |
* | | | | | 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 | |
* | | | | | 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. | Scott Willson | 2012-10-16 | 3 | -2/+16 | |
|/ / / / | ||||||
* | | | | Merge pull request #7371 from csmuc/fix_dup_validation_errors | Santiago Pastorino | 2012-10-16 | 3 | -0/+20 | |
|\ \ \ \ | ||||||
| * | | | | Call super to nullify the reference to the original errors object in the dup'... | Christian Seiler | 2012-10-16 | 3 | -0/+20 | |
* | | | | | Merge pull request #7963 from arunagw/redcarpet_not_for_jruby | Carlos Antonio da Silva | 2012-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
* | | | | | | 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 | Matt Bridges | 2012-10-15 | 1 | -0/+4 | |
|/ / / / / / | ||||||
* | | | | | | 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 | 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 appending extensions and computi... | Joshua Peek | 2012-10-15 | 2 | -2/+21 | |
* | | | | | | buckets hash isn't public, so use symbol keys to avoid string | Aaron Patterson | 2012-10-15 | 1 | -8/+8 | |
* | | | | | | Move two hotspots to use Hash[] rather than Hash#dup | Aaron Patterson | 2012-10-15 | 1 | -3/+5 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7927 from josh/asset-path-helper | Rafael Mendonça França | 2012-10-15 | 11 | -505/+289 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | 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" | Andrey Samsonov | 2012-10-15 | 1 | -4/+0 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #7952 from ayrton/minor_cleanup | Santiago Pastorino | 2012-10-15 | 1 | -5/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | 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 | Angelo Capilleri | 2012-10-14 | 1 | -1/+2 | |
|/ / / / / | ||||||
* | | | | | 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 | 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 Ruby 1.9 Hash syntax in railties | Robin Dupret | 2012-10-14 | 94 | -447/+447 | |
* | | | | | | | Merge pull request #7943 from NARKOZ/patch-4 | Jeremy Kemper | 2012-10-14 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | remove 'then' from conditional statement | Nihad Abbasov | 2012-10-14 | 1 | -2/+4 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #7937 from arturopie/7914-defaults-on-domains-and-multiple... | Rafael Mendonça França | 2012-10-13 | 6 | -15/+61 | |
|\| | | | | | ||||||
| * | | | | | #7914 Remove code for unsupported postgreSQL version. | Arturo Pie | 2012-10-13 | 2 | -6/+0 | |
| * | | | | | #7914 Using a better way to get the defaults from db. | Arturo Pie | 2012-10-13 | 2 | -6/+7 | |
| * | | | | | #7914 Add change of previous commit to CHANGELOG.md | Arturo Pie | 2012-10-13 | 1 | -0/+4 | |
| * | | | | | #7914 get default value when type uses schema name | Arturo Pie | 2012-10-13 | 4 | -3/+50 | |
|/ / / / / |