aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Return proper format on exceptionsSantiago Pastorino2012-06-113-14/+81
* 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
* | | Merge pull request #6708 from amatsuda/ignore_git_ignored_files_in_rake_test_...José Valim2012-06-111-1/+1
|\ \ \
| * | | ignore .gitignore'd files in rake test:uncomittedAkira Matsuda2012-06-121-1/+1
| |/ /
* | | Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fixRafael Mendonça França2012-06-111-1/+1
|\ \ \
| * | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9Akira Matsuda2012-06-121-1/+1
| |/ /
* | | Merge pull request #6705 from ganeshkumar/string_method_changesRafael Mendonça França2012-06-112-8/+8
|\ \ \
| * | | both string and sumbol will be interpolated as string no need to convert to_sganesh2012-06-112-8/+8
* | | | Merge pull request #6704 from amatsuda/lambda_respond_to_bindingJosé Valim2012-06-111-43/+39
|\ \ \ \ | |/ / / |/| | |
| * | | Proc always respond_to :bindingAkira Matsuda2012-06-121-43/+39
| |/ /
* | | Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-112-1/+12
|\ \ \ | |/ / |/| |
| * | Added a testcase for #6690.kennyj2012-06-121-0/+11
| * | fix stylesheet template dirSugino Yasuhiro2012-06-091-1/+1
* | | Merge pull request #6699 from takkanm/fix-character-class-duplicated-range-wa...Rafael Mendonça França2012-06-111-1/+1
|\ \ \
| * | | fix warning in Ruby2.0.0takkanm2012-06-111-1/+1
* | | | Merge pull request #6698 from yahonda/address_ora_911_masterRafael Mendonça França2012-06-102-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Address ORA-00911 errors because of the heading underscore.Yasuo Honda2012-06-112-2/+2
|/ / /
* | | Merge pull request #6521 from Empact/throw-resultRafael Mendonça França2012-06-102-1/+8
|\ \ \
| * | | 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
|/ / /
* | | Merge pull request #6694 from arunagw/build_fix_masterJosé Valim2012-06-101-1/+1
|\ \ \
| * | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fbaArun Agrawal2012-06-101-1/+1
|/ / /
* | | Merge pull request #6692 from schneems/schneems/something-went-wrongJosé Valim2012-06-102-0/+2
|\ \ \
| * | | add prompt to 404 & 500 pages to check logsschneems2012-06-092-0/+2
* | | | Use . instead of :: for class methods, add CHANGELOG entriesJosé Valim2012-06-105-5/+10
* | | | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-106-0/+74
|\ \ \ \
| * | | | test errors for pending migrationsschneems2012-06-091-0/+15
| * | | | raise error for pending migration schneems2012-06-095-4/+40
| * | | | 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
* | | | | | removes the obsolete require_association method from dependenciesXavier Noria2012-06-103-21/+7
| |_|/ / / |/| | | |
* | | | | 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
| |_|/ / |/| | |
* | | | Fix tests, active_authorizer shouldn't include blank valuesPiotr Sarnacki2012-06-091-1/+1
|/ / /
* | | Merge pull request #6668 from pomnikita/masterPiotr Sarnacki2012-06-082-1/+7
|\ \ \
| * | | Compact array of values added to PermissionSet instanceNikita Pomyashchiy2012-06-082-1/+7
* | | | Merge pull request #6681 from arunagw/plugin_gen_fixRafael Mendonça França2012-06-082-3/+9
|\ \ \ \
| * | | | We should not include engine.rake file into rakeArun Agrawal2012-06-082-1/+9
| * | | | Removed protected as we already doing it above.Arun Agrawal2012-06-081-2/+0