aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6713 from etehtsea/activerecord-uuidRafael Mendonça França2012-06-142-3/+8
|\
| * Add uuid type support to PostgreSQL adapterKonstantin Shabanov2012-06-142-3/+8
* | Merge pull request #6738 from steveklabnik/masterXavier Noria2012-06-143-21/+6
|\ \
| * | Remove update_attribute.Steve Klabnik2012-06-143-21/+6
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-141-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed typo.chrismcc2012-06-111-1/+1
* | | Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Don't assign the attributes if the list is empty.Aurelian Oancea2012-06-081-1/+1
* | | Merge pull request #6492 from pmahoney/fair-connection-pool2Rafael Mendonça França2012-06-111-37/+174
|\ \ \
| * | | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-251-37/+174
* | | | Address ORA-00911 errors because of the heading underscore.Yasuo Honda2012-06-111-1/+1
* | | | Fix that #exists? raises ThrowResult when called with an empty limitedBen Woosley2012-06-101-0/+2
* | | | 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-101-1/+1
* | | | 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-101-5/+5
|\ \ \ \
| * | | | Fix #6635. We should call Scoping methods, before calling Array methods.kennyj2012-06-101-5/+5
* | | | | Ensure that mass assignment options are preservedAndrew White2012-06-102-10/+13
|/ / / /
* | | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fbaArun Agrawal2012-06-101-1/+1
* | | | Use . instead of :: for class methods, add CHANGELOG entriesJosé Valim2012-06-101-2/+2
* | | | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-102-0/+39
|\ \ \ \
| * | | | raise error for pending migration schneems2012-06-092-2/+33
| * | | | add convenience methods for checking migrationsschneems2012-06-031-0/+8
* | | | | Merge pull request #6683 from stevecj/fix-fragile-assert-queriesRafael Mendonça França2012-06-091-19/+31
|\ \ \ \ \
| * | | | | Fix fragile #assert_queries implementation and usages.Steve Jorgensen2012-06-091-19/+31
| | |_|/ / | |/| | |
* | | | | 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
|/ / / /
* | | | Merge pull request #6629 from marcandre/destroyCarlos Antonio da Silva2012-06-062-0/+20
|\ \ \ \
| * | | | + ActiveRecord::Base#destroy!Marc-Andre Lafortune2012-06-062-0/+20
* | | | | reduce number of StringsAkira Matsuda2012-06-061-1/+1
* | | | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-061-1/+1
|/ / / /
* | | / Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
| |_|/ |/| |
* | | minor comment revisionXavier Noria2012-06-011-1/+1
* | | improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
* | | unused method argumentsAkira Matsuda2012-06-011-7/+6
* | | modulize AR::NullRelationAkira Matsuda2012-06-012-3/+3
* | | Merge branch 'master-sec'Aaron Patterson2012-05-312-3/+18
|\ \ \
| * | | predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-302-3/+18
* | | | Psych is always available on 1.9Jeremy Kemper2012-05-312-29/+23
* | | | Fix wrong example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
* | | | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-05-311-0/+1
* | | | Fix backward compatibility with stored Hash values. Wrap coders to convert se...Jeremy Kemper2012-05-301-2/+32
* | | | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Properly discover a connection is closed in postgresql_adapterSteve Klabnik2012-05-241-1/+2
* | | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-303-5/+6
|\ \ \ \
| * | | | Fix #5797. Error calling dup method on AR model with serialized fieldkennyj2012-05-303-5/+6
* | | | | Merge pull request #6386 from kennyj/fix_logs_name_consistencyAaron Patterson2012-05-303-18/+15
|\ \ \ \ \
| * | | | | Fix logs name consistency.kennyj2012-05-193-18/+15
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-304-23/+33
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |