Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Fixed nil field value uniqueness check | pyromaniac | 2012-01-06 | 2 | -2/+14 | |
| | | ||||||
* | | Revert "Merge pull request #2325 from pyromaniac/master" | José Valim | 2012-01-06 | 2 | -13/+1 | |
| | | | | | | | | | | | | | | It breaks the build for mysql. This reverts commit 958d25df4a1b0d41ce5deeeb0739c93b49bbd18d, reversing changes made to 8f309e31057e1b26fefedb199ab0526126fb1fe4. | |||||
* | | Merge pull request #4343 from carlosantoniodasilva/activerecord-1.9-compat | José Valim | 2012-01-05 | 2 | -4/+4 | |
|\ \ | | | | | | | Activerecord 1.9 compat | |||||
| * | | Revert "Regexp.union seems to have different results in 1.8" | Carlos Antonio da Silva | 2012-01-06 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | This reverts commit d80e4ee20e690dfc0f4ec31c41b873d607462872. No need to care about 1.8 anymore, so reverting :) | |||||
| * | | Revert "Add return for 1.8.7" | Carlos Antonio da Silva | 2012-01-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | This reverts commit 665ef116ac9000d514c03fc61b216513f5cb7b25. There is no need for the return anymore, so reverting. | |||||
* | | | Merge pull request #4340 from rafaelfranca/patch-1 | José Valim | 2012-01-05 | 13 | -31/+19 | |
|\ \ \ | | | | | | | | | Remove more Array.wrap calls | |||||
| * | | | Whitespaces :scissors: | Rafael Mendonça França | 2012-01-06 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Remove Array.wrap calls in ActiveRecord | Rafael Mendonça França | 2012-01-06 | 13 | -30/+18 | |
| |/ / | ||||||
* / / | Fixed nil field value uniqueness check | pyromaniac | 2012-01-06 | 2 | -1/+13 | |
|/ / | ||||||
* | | test a subclass so that the removed method does not imact other tests | Aaron Patterson | 2012-01-05 | 2 | -3/+6 | |
| | | ||||||
* | | Use 1.9 way | Santiago Pastorino | 2012-01-05 | 1 | -6/+1 | |
| | | ||||||
* | | Merge pull request #4330 from lest/remove-call-mbchars | Aaron Patterson | 2012-01-05 | 1 | -1/+1 | |
|\ \ | | | | | | | remove useless call to mb_chars | |||||
| * | | remove useless call to mb_chars | Sergey Nartimov | 2012-01-05 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #4303 from Karunakar/logger | Santiago Pastorino | 2012-01-05 | 2 | -2/+2 | |
|\ \ \ | |/ / |/| | | Moved the logger methods in activeresource/test/abstract_unit.rb | |||||
| * | | Moved all the logger methods to active support logger | Karunakar (Ruby) | 2012-01-06 | 2 | -2/+2 | |
| | | | | | | | | | | | | minor | |||||
* | | | do not require a file that is not used | Aaron Patterson | 2012-01-05 | 1 | -0/+1 | |
|/ / | ||||||
* | | delete reaping frequency from the db config | Aaron Patterson | 2012-01-05 | 1 | -4/+6 | |
| | | ||||||
* | | Merge pull request #4301 from Karunakar/refactor_tests | Aaron Patterson | 2012-01-05 | 1 | -4/+7 | |
|\ \ | | | | | | | Refactor tests | |||||
| * | | removed unnecessary +1 from assert_difference because default difference is 1 | Karunakar (Ruby) | 2012-01-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | refactored tests -- assert_diffrence instead of checking directly with count | Karunakar (Ruby) | 2012-01-04 | 1 | -4/+7 | |
| |/ | ||||||
* | | Merge pull request #4315 from larskanis/allow_setting_of_pgconn_params | Aaron Patterson | 2012-01-05 | 2 | -17/+39 | |
|\ \ | | | | | | | PostgreSQL: Allow consistent setting of libpq params in database connection specification | |||||
| * | | Postgresql: restore previous behaviour regarding to nil values in connection ↵ | Lars Kanis | 2012-01-05 | 1 | -0/+1 | |
| | | | | | | | | | | | | specification Hash | |||||
| * | | Postgresql: add test case for setting custom libpq connection parameters | Lars Kanis | 2012-01-04 | 1 | -0/+15 | |
| | | | ||||||
| * | | Postgresql: Allow setting of any libpq connection parameters | Lars Kanis | 2012-01-03 | 1 | -17/+23 | |
| | | | ||||||
* | | | deleted duplicated line | juan david pastas | 2012-01-05 | 1 | -1/+0 | |
| | | | ||||||
* | | | Revert "active record base class test case should not be public" | Santiago Pastorino | 2012-01-05 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | People use this! This reverts commit 071c8bf62ac7ffdb587268a6789fd825d0dae2a6. | |||||
* | | | call super from setup | Aaron Patterson | 2012-01-04 | 2 | -0/+5 | |
| | | | ||||||
* | | | just use the list of formatting keys we care about | Aaron Patterson | 2012-01-04 | 1 | -1/+1 | |
| | | | ||||||
* | | | call super | Aaron Patterson | 2012-01-04 | 1 | -0/+10 | |
| | | | ||||||
* | | | clear the sql counter on teardown so the GC can do it's thing | Aaron Patterson | 2012-01-04 | 1 | -0/+4 | |
| | | | ||||||
* | | | fix some formatting | Aaron Patterson | 2012-01-04 | 1 | -2/+6 | |
| | | | ||||||
* | | | use regular expression or statement. loltargetrichenvironment | Aaron Patterson | 2012-01-04 | 1 | -1/+1 | |
| | | | ||||||
* | | | active record base class test case should not be public | Aaron Patterson | 2012-01-04 | 1 | -0/+0 | |
| | | | ||||||
* | | | 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 | |
| | | | | ||||||
* | | | | No need to require psych since require yaml does that. | Rafael Mendonça França | 2012-01-04 | 4 | -4/+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 use rescue block to require psych | Rafael Mendonça França | 2012-01-04 | 4 | -34/+17 | |
| | | | | ||||||
* | | | | No need to check if YAML::ENGINE is defined since ruby 1.9 does that | Rafael Mendonça França | 2012-01-04 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | create_fixtures should accept symbol keys for custom table -> class ↵ | Jeremy Kemper | 2012-01-03 | 2 | -4/+14 | |
| | | | | | | | | | | | | mappings. Fixes an unintended regression. | |||||
* | | | 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 | 225 | -10667/+13689 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-10-05 | 14 | -19/+57 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-10-01 | 16 | -29/+140 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-09-15 | 22 | -123/+212 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | 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. |