aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* removes item in the Active Record CHANGELOGXavier Noria2012-06-141-2/+0
* using hax to fix tests on Ruby 2.0Aaron Patterson2012-06-131-1/+6
* Fix buildSantiago Pastorino2012-06-131-2/+2
* Merge pull request #6721 from homakov/patch-2Santiago Pastorino2012-06-131-3/+0
|\
| * These lines don't help to mitigate CVE. They only turn [nil] into nil, w/o th...Egor Homakov2012-06-131-3/+0
* | ActionController::Caching depends on RackDelegation and AbstractController::C...Santiago Pastorino2012-06-132-0/+35
|/
* raise the same exception in order to keep path infoAaron Patterson2012-06-122-1/+15
* fixing security email addressAaron Patterson2012-06-121-1/+1
* Merge branch 'master-sec'Aaron Patterson2012-06-122-2/+8
|\
| * Array parameters should not contain nil values.Aaron Patterson2012-06-122-2/+8
* | Merge pull request #6715 from arunagw/add_assertsRafael Mendonça França2012-06-121-2/+2
|\ \
| * | 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
* | | content_type is already a Mime::Type objectSantiago Pastorino2012-06-121-1/+1
* | | This consider_all_requests_local doesn't make senseSantiago Pastorino2012-06-122-21/+2
* | | Merge pull request #6444 from kennyj/create_extenstion_hstoreRafael Mendonça França2012-06-122-0/+12
|\ \ \
| * | | Create hstore extension when building PostgreSQL databases.kennyj2012-06-122-0/+12
|/ / /
* | | Merge pull request #6711 from takkanm/fix-warning-LoadError-path-methodJosé Valim2012-06-121-5/+7
|\ \ \
| * | | fix method redefined warning in Ruby2.0Mitsutaka Mimura2012-06-121-5/+7
* | | | Stop relying on mutable structures in the FileUpdateCheckerJosé Valim2012-06-122-35/+7
|/ / /
* | / 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
* | 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
|\ \ \ \