Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove more references to postgres on the release notes | Santiago Pastorino | 2012-01-04 | 1 | -2/+0 |
| | |||||
* | Postgres is on travis right now, don't need an special mention here | Santiago Pastorino | 2012-01-04 | 1 | -6/+0 |
| | |||||
* | Merge pull request #4302 from lest/simplify-descendants | Xavier Noria | 2012-01-04 | 1 | -1/+1 |
|\ | | | | | simplify Class#descendants using singleton_class method | ||||
| * | simplify Class#descendants using singleton_class method | Sergey Nartimov | 2012-01-04 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4282 from edgecase/order_after_reorder | Aaron Patterson | 2012-01-04 | 6 | -9/+25 |
|\ | | | | | correctly handle order calls after a reorder | ||||
| * | correctly handle order calls after a reorder | Matt Jones + Scott Walker | 2012-01-03 | 6 | -9/+25 |
| | | |||||
* | | Merge pull request #4296 from kuroda/negative_format | Aaron Patterson | 2012-01-04 | 2 | -0/+8 |
|\ \ | | | | | | | Infer currency negative format from positive one. | ||||
| * | | Infer currency negative format from positive one. | Tsutomu Kuroda | 2012-01-05 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | When a locale file sets the format of the positive currency value as '%n %u', the default negative currency format should be '-%n %u'. | ||||
* | | | Merge pull request #4298 from rafaelfranca/patch-2 | Aaron Patterson | 2012-01-04 | 12 | -129/+22 |
|\ \ \ | | | | | | | | | Remove rescue block to require psych gem | ||||
| * | | | No need to require psych since require yaml does that. | Rafael Mendonça França | 2012-01-04 | 7 | -7/+0 |
| | | | | |||||
| * | | | No need to override to_yaml and yaml_initialize methods in ActiveRecord::Core | Rafael Mendonça França | 2012-01-04 | 1 | -20/+0 |
| | | | | |||||
| * | | | No need to override to_yaml method in ActiveSupport::TimeWithZone | Rafael Mendonça França | 2012-01-04 | 1 | -7/+1 |
| | | | | |||||
| * | | | No need to override to_yaml method in ActiveSupport::OrderedHash | Rafael Mendonça França | 2012-01-04 | 1 | -15/+0 |
| | | | | |||||
| * | | | No need to override the to_yaml method in ActiveSupporte::SafeBuffer | Rafael Mendonça França | 2012-01-04 | 1 | -5/+0 |
| | | | | |||||
| * | | | No need to override the to_yaml method in BigDecimal | Rafael Mendonça França | 2012-01-04 | 1 | -15/+0 |
| | | | | |||||
| * | | | No need to use rescue block to require psych | Rafael Mendonça França | 2012-01-04 | 9 | -69/+30 |
| | | | | |||||
| * | | | No need to check if YAML::ENGINE is defined since ruby 1.9 does that | Rafael Mendonça França | 2012-01-04 | 5 | -5/+5 |
| | | | | |||||
* | | | | Merge pull request #4299 from Karunakar/logger | Aaron Patterson | 2012-01-04 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | using the active support logger | ||||
| * | | | using the active support logger | Karunakar (Ruby) | 2012-01-04 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #4289 from rafaelfranca/patch-1 | Santiago Pastorino | 2012-01-04 | 3 | -2/+10 |
|\ \ \ | | | | | | | | | No need of html_safe here | ||||
| * | | | Whitespaces :scissors: | Rafael Mendonça França | 2012-01-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make sure that check_box helper return a safe buffer | Rafael Mendonça França | 2012-01-04 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add test to make sure that add two safe buffers always return a safe buffer | Rafael Mendonça França | 2012-01-04 | 1 | -0/+7 |
| | | | | |||||
| * | | | No need of html_safe here | Rafael Mendonça França | 2012-01-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | tag helper always return a html safe string and concat two html safe strings always return a html safe string | ||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-04 | 2 | -75/+112 |
|\ \ \ \ | |||||
| * | | | | copy edits | Vijay Dev | 2012-01-04 | 1 | -10/+7 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Pablo Ifran | 2012-01-02 | 30 | -240/+570 |
| |\ \ \ \ | |||||
| | * | | | | General editing pass over assets pipeline guide | Mike Gunderloy | 2011-12-31 | 1 | -56/+58 |
| | | | | | | |||||
| * | | | | | improve doc in number helper options | Pablo Ifran | 2012-01-02 | 1 | -19/+57 |
| | | | | | | |||||
* | | | | | | updates to 3.2 release notes | Vijay Dev | 2012-01-04 | 1 | -1/+8 |
| |_|_|/ / |/| | | | | |||||
* | | | | | create_fixtures should accept symbol keys for custom table -> class ↵ | Jeremy Kemper | 2012-01-03 | 2 | -4/+14 |
| |_|/ / |/| | | | | | | | | | | | mappings. Fixes an unintended regression. | ||||
* | | | | Merge pull request #4286 from kennyj/fix_4285 | José Valim | 2012-01-03 | 2 | -1/+7 |
|\ \ \ \ | | | | | | | | | | | Fix GH #4285. Remove options when we record calling creat_table | ||||
| * | | | | Fix GH #4285. Remove options when we record calling creat_table | kennyj | 2012-01-04 | 2 | -1/+7 |
|/ / / / | |||||
* | | | | use File.basename to get the filename minus .yml | Aaron Patterson | 2012-01-03 | 1 | -2/+3 |
| | | | | |||||
* | | | | setup_fixture_accessors should accept symbols for table names. Fixes an ↵ | Jeremy Kemper | 2012-01-03 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | unintended (and untested) regression. | ||||
* | | | | Merge pull request #2955 from dmitry/master | Aaron Patterson | 2012-01-03 | 5 | -9/+19 |
|\ \ \ \ | | | | | | | | | | | Polymorphic with optimistic lock and counter cache should be destroyed | ||||
| * | | | | Removed metaclass from the has_many dependency destroy method. Fixes #2954 | Dmitry Polushkin | 2011-12-31 | 2 | -8/+5 |
| | | | | | |||||
| * | | | | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-12-31 | 795 | -28340/+35803 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-10-05 | 62 | -374/+686 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-10-01 | 123 | -668/+1492 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-09-15 | 190 | -825/+2362 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Test polymorphic record with optimistic locking and counter cache should be ↵ | Dmitry Polushkin | 2011-09-09 | 3 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | destoyed without catching the ActiveRecord::StaleObjectError. | ||||
* | | | | | | | | | Merge pull request #4283 from lest/fix-singleton-checking | Aaron Patterson | 2012-01-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | use correct variant of checking whether class is a singleton | ||||
| * | | | | | | | | | use correct variant of checking whether class is a singleton | Sergey Nartimov | 2012-01-03 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417 | Santiago Pastorino | 2012-01-03 | 2 | -2/+8 |
| | | | | | | | | | |||||
* | | | | | | | | | Override respond_to? since we are also overriding method_missing. | José Valim | 2012-01-03 | 2 | -0/+11 |
| | | | | | | | | | |||||
* | | | | | | | | | Clean up routes inclusion and add some comments for the next soul that ↵ | José Valim | 2012-01-03 | 4 | -60/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decides to adventure on this code. | ||||
* | | | | | | | | | Add font_path helper method | Santiago Pastorino | 2012-01-03 | 6 | -0/+41 |
| | | | | | | | | | |||||
* | | | | | | | | | actually disconnect from the database at the end of each test | Aaron Patterson | 2012-01-03 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #4274 from joneslee85/changelog-fix | Aaron Patterson | 2012-01-03 | 1 | -114/+122 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix typos and formats for CHANGELOG |