Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #550 from jasondew/patch-1 | José Valim | 2011-05-13 | 1 | -1/+1 |
|\ | | | | | typo | ||||
| * | typo | Jason Dew | 2011-05-13 | 1 | -1/+1 |
|/ | |||||
* | Instead of doing find(:all) which does scoped.find(:all) which does ↵ | Jon Leighton | 2011-05-13 | 1 | -1/+1 |
| | | | | scoped.all, just do scoped.all. | ||||
* | Remove pointless rescue (it doesn't happen anywhere in the tests, and I ↵ | Jon Leighton | 2011-05-13 | 1 | -9/+1 |
| | | | | can't see a way that it would happen ever) | ||||
* | Merge pull request #540 from sikachu/mailer_generator_1_9_style | José Valim | 2011-05-13 | 3 | -6/+28 |
|\ | | | | | Update Mailer generator to use 1.9 styled hash when run on Ruby 1.9 | ||||
| * | Update Mailer generator to use 1.9 styled hash when run on Ruby 1.9 | Prem Sichanugrist | 2011-05-13 | 3 | -6/+28 |
|/ | | | | As always, you can run `--old-style-hash` to override that. | ||||
* | Merge pull request #542 from guilleiguaran/1_9_hash_style | José Valim | 2011-05-13 | 1 | -1/+1 |
|\ | | | | | Use new hash syntax in wrap_parameters initializer under Ruby 1.9 | ||||
| * | Using new hash syntax in wrap_parameters initializer under Ruby 1.9 | Guillermo Iguaran | 2011-05-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #547 from vatrai/patch-1 | José Valim | 2011-05-13 | 1 | -1/+1 |
|\ \ | | | | | | | rack_mount upgrade to new version 0.8.0 | ||||
| * | | rack_mount upgrade to new version 0.8.0 | Vishnu K. Sharma | 2011-05-13 | 1 | -1/+1 |
| | | | |||||
* | | | move bundler loading down to #bundle_command | Xavier Noria | 2011-05-13 | 1 | -2/+3 |
| | | | |||||
* | | | backport skip to the AR base class | Aaron Patterson | 2011-05-13 | 1 | -0/+7 |
| | | | |||||
* | | | supporting infinity and -infinity for timestamps in PG. fixes #544 | Aaron Patterson | 2011-05-13 | 2 | -0/+39 |
| | | | |||||
* | | | run bundler programmatically rather than shelling out | Xavier Noria | 2011-05-13 | 1 | -7/+3 |
|/ / | |||||
* | | Merge pull request #538 from arunagw/update_rack_mount | Piotr Sarnacki | 2011-05-13 | 2 | -1/+29 |
|\ \ | |/ |/| | Update rack mount | ||||
| * | Test added for getting route segment values | Arun Agrawal | 2011-05-13 | 1 | -0/+28 |
| | | |||||
| * | rack-mount gem updated. | Arun Agrawal | 2011-05-13 | 1 | -1/+1 |
| | | |||||
* | | Update for sprockets/master context class api | Joshua Peek | 2011-05-12 | 1 | -1/+9 |
|/ | |||||
* | use #quietly in a few places, and s/silence/capture/ where intention is capture | Xavier Noria | 2011-05-13 | 2 | -12/+12 |
| | |||||
* | Merge pull request #537 from amatsuda/update_scripts2 | Xavier Noria | 2011-05-12 | 1 | -1/+0 |
|\ | | | | | eliminating the noise | ||||
| * | eliminating the noise | Akira Matsuda | 2011-05-13 | 1 | -1/+0 |
|/ | |||||
* | new reporting method Kernel#quietly | Xavier Noria | 2011-05-13 | 5 | -4/+26 |
| | |||||
* | silences stderr to prevent an expected error message in the test suite from ↵ | Xavier Noria | 2011-05-13 | 1 | -2/+1 |
| | | | | being echoed | ||||
* | say something when running bundle commands | Xavier Noria | 2011-05-13 | 1 | -0/+2 |
| | | | | | | This is convenient because we buffer stdout. In particular bundle install takes a while and generation just hangs there with no indication of what's going on otherwise. | ||||
* | say silence when you mean silence | Xavier Noria | 2011-05-13 | 1 | -1/+1 |
| | |||||
* | application and plugin generation run bundle check unless --skip-gemfile | Xavier Noria | 2011-05-13 | 6 | -15/+37 |
| | | | | | | | The purpose of this feature is that the user knows whether dependencies are satisfied. In particular, if they are not he will be warned upfront, rather than finding out himself in an abrupt way by trying to run something. | ||||
* | removes duplicate tests | Xavier Noria | 2011-05-13 | 1 | -13/+0 |
| | |||||
* | Don't use mass-assignment protection when setting foreign keys or ↵ | Jon Leighton | 2011-05-12 | 3 | -9/+45 |
| | | | | association conditions on singular associations. Fixes #481 (again). | ||||
* | Merge pull request #532 from amatsuda/update_script | José Valim | 2011-05-12 | 1 | -4/+14 |
|\ | | | | | Revert "Delegate everything to the generator" | ||||
| * | Revert "Delegate everything to the generator" | Akira Matsuda | 2011-05-13 | 1 | -4/+14 |
| | | | | | | | | | | | | This reverts commit 0904e8256864239f673bf91fce1cfffb9345ee61. reason: rake rails:update:scripts fails due to this change | ||||
* | | Merge pull request #531 from amatsuda/update_javascripts | José Valim | 2011-05-12 | 1 | -7/+2 |
|\ \ | | | | | | | remove update:javascripts rake task | ||||
| * | | remove update:javascripts rake task | Akira Matsuda | 2011-05-13 | 1 | -7/+2 |
| |/ | | | | | | | because javascript libraries are not bundled anymore, and create_javascript_files generator was already removed | ||||
* / | The new release supposedly fixed things, but it is still b0rked -- comment ↵ | David Heinemeier Hansson | 2011-05-12 | 1 | -1/+1 |
|/ | | | | out for now pending JPs investigation into whats up | ||||
* | Proper fix | David Heinemeier Hansson | 2011-05-12 | 1 | -1/+1 |
| | |||||
* | Fix the assets regexp for non-js/css files | David Heinemeier Hansson | 2011-05-12 | 1 | -1/+1 |
| | |||||
* | Merge pull request #527 from joshk/deprecation_circular_dependency | Santiago Pastorino | 2011-05-12 | 1 | -2/+0 |
|\ | | | | | Remove a circular require in AS deprecations. | ||||
| * | Remove a circular require in AS deprecations. This is safe as AS ↵ | Josh Kalderimis | 2011-05-12 | 1 | -2/+0 |
|/ | | | | deprecations is autoloaded as needed. | ||||
* | Merge pull request #524 from joshk/ar_create_mas_correction | José Valim | 2011-05-12 | 4 | -18/+44 |
|\ | | | | | AR#create! allows for :as => role, and AR changelog update | ||||
| * | updated AR#create! to accept an options hash so the mass-assignment security ↵ | Josh Kalderimis | 2011-05-12 | 4 | -18/+44 |
|/ | | | | role can be passed in, also updated the Changelog to mention the change to some of the AR method signatures. | ||||
* | Merge pull request #227 from farski/master | Santiago Pastorino | 2011-05-11 | 2 | -6/+6 |
|\ | | | | | Unnecessary redundancy in Time/Date calculations | ||||
| * | Removed some redundant Time#change time options from beginning_of_ methods ↵ | Chris Kalafarski | 2011-03-13 | 2 | -6/+6 |
| | | | | | | | | in Date and Time | ||||
* | | Merge pull request #521 from seanmccann/patch-1 | Santiago Pastorino | 2011-05-11 | 1 | -1/+0 |
|\ \ | | | | | | | Removed extra newline at end of development config file. (There were 2) | ||||
| * | | Remove extra line at end of development config file. | Sean McCann | 2011-05-11 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #491 from arunagw/readme_changes | Santiago Pastorino | 2011-05-11 | 5 | -7/+7 |
|\ \ \ | | | | | | | | | Some readme fixes as required. | ||||
| * | | | Some readme fixes as required. | Arun Agrawal | 2011-05-10 | 5 | -7/+7 |
| | | | | |||||
* | | | | Depend on master uglifier for now | Santiago Pastorino | 2011-05-11 | 2 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculations | Jon Leighton | 2011-05-11 | 3 | -6/+18 |
|\ \ \ \ | |_|/ / |/| | | | Bug fixes for calculations with includes | ||||
| * | | | Bug fixes: | Fadzril Muhamad & Joseph Palermo | 2011-05-12 | 3 | -6/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | - If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not. - When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count. Looks like it was broken here: https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265 | ||||
* | | | | Add missing requires | Santiago Pastorino | 2011-05-11 | 2 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #515 from joshk/patch-3 | José Valim | 2011-05-11 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | updated the ActiveSupport changelog |