aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6759 from dylanahsmith/only-catch-standard-errorSantiago Pastorino2012-06-173-6/+6
|\
| * Avoid unnecessary catching of Exception instead of StandardError.Dylan Smith2012-06-173-6/+6
* | Adding `load_config` task as dependency.Cairo Noleto2012-06-161-14/+14
|/
* Don't read csv file during executing db:fixtures:load.kennyj2012-06-171-1/+1
* no need to define methods in included hookJon Leighton2012-06-151-13/+13
* Fix deprecation warnings when using config.active_record.mass_assignment_sani...Jon Leighton2012-06-152-3/+40
* Fix observers with AR::ModelJon Leighton2012-06-153-3/+6
* Fix config.active_record.whitelist_attributes with AR::ModelJon Leighton2012-06-153-3/+40
* Simplify AR configuration code.Jon Leighton2012-06-1524-265/+348
* refactorJon Leighton2012-06-151-11/+5
* Remove unneded tests.Rafael Mendonça França2012-06-141-11/+1
* Add CHANGELOG entry to the uuid datatype support to PostgreSQL adpterRafael Mendonça França2012-06-141-0/+2
* Merge pull request #6713 from etehtsea/activerecord-uuidRafael Mendonça França2012-06-146-10/+39
|\
| * Add uuid type support to PostgreSQL adapterKonstantin Shabanov2012-06-146-10/+39
* | registers the removal of update_attribute in the CHANGELOGXavier Noria2012-06-141-0/+6
* | Merge pull request #6738 from steveklabnik/masterXavier Noria2012-06-147-87/+11
|\ \
| * | Remove update_attribute.Steve Klabnik2012-06-147-87/+11
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-141-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed typo.chrismcc2012-06-111-1/+1
* | | removes item in the Active Record CHANGELOGXavier Noria2012-06-141-2/+0
* | | Need a assert here in testsArun Agrawal2012-06-121-2/+2
* | | Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-122-1/+5
|\ \ \
| * | | Don't assign the attributes if the list is empty.Aurelian Oancea2012-06-082-1/+5
* | | | Create hstore extension when building PostgreSQL databases.kennyj2012-06-121-0/+10
| |_|/ |/| |
* | | Remove warnings and unused codeRafael Mendonça França2012-06-112-7/+2
* | | No need to cache table metadata in advance now that #6683 was merged.Rafael Mendonça França2012-06-112-16/+0
* | | Merge pull request #6492 from pmahoney/fair-connection-pool2Rafael Mendonça França2012-06-115-38/+286
|\ \ \
| * | | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-254-38/+282
| * | | Cache metadata in advance to avoid extra sql statements while testing.Yasuo Honda2012-05-251-0/+7
* | | | Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125Rafael Mendonça França2012-06-111-1/+1
|\ \ \ \
| * | | | current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6Akira Matsuda2012-06-121-1/+1
* | | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9Akira Matsuda2012-06-121-1/+1
|/ / / /
* | | | Address ORA-00911 errors because of the heading underscore.Yasuo Honda2012-06-112-2/+2
* | | | Fix that #exists? raises ThrowResult when called with an empty limitedBen Woosley2012-06-102-1/+8
* | | | Remove bundle exec from the exception messageRafael Mendonça França2012-06-101-1/+1
* | | | Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-102-1/+7
* | | | Minimal change to query generation of exists? that makes SQLServer and others...iaddict2012-06-101-1/+1
* | | | Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-102-5/+14
|\ \ \ \
| * | | | Fix #6635. We should call Scoping methods, before calling Array methods.kennyj2012-06-102-5/+14
* | | | | Ensure that mass assignment options are preservedAndrew White2012-06-104-11/+55
|/ / / /
* | | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fbaArun Agrawal2012-06-101-1/+1
* | | | Use . instead of :: for class methods, add CHANGELOG entriesJosé Valim2012-06-103-4/+7
* | | | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-103-0/+54
|\ \ \ \
| * | | | raise error for pending migration schneems2012-06-093-4/+35
| * | | | add convenience methods for checking migrationsschneems2012-06-032-0/+23
* | | | | Merge pull request #6683 from stevecj/fix-fragile-assert-queriesRafael Mendonça França2012-06-095-25/+37
|\ \ \ \ \
| * | | | | Fix fragile #assert_queries implementation and usages.Steve Jorgensen2012-06-095-25/+37
| | |_|/ / | |/| | |
* | | | | Remove conditional committed by accidentSantiago Pastorino2012-06-091-1/+1
* | | | | Use each_with_object instead of each hereSantiago Pastorino2012-06-092-4/+4
* | | | | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
|/ / / /