aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Share lock: more accurate livelock fix for aa598f4Jeremy Daer2016-04-241-3/+2
* Merge pull request #24715 from vipulnsward/nodoc-st-poolKasper Timm Hansen2016-04-241-1/+1
|\
| * :nodoc: internal StatementPool class.Vipul A M2016-04-241-1/+1
* | Merge pull request #24712 from vipulnsward/23461-release-notesKasper Timm Hansen2016-04-241-3/+8
|\ \ | |/ |/|
| * Add #23461 to release notesVipul A M2016-04-241-3/+8
|/
* Merge pull request #24710 from prathamesh-sonpatki/fix-buildKasper Timm Hansen2016-04-241-2/+2
|\
| * Fix broken build, channel files are also included in `bin/rails stats` nowPrathamesh Sonpatki2016-04-241-2/+2
|/
* Merge pull request #24709 from y-yagi/add_channels_files_in_stats_taskJeremy Daer2016-04-231-0/+1
|\
| * add channels files in `stats` taskyuuji.yaginuma2016-04-241-0/+1
* | Merge pull request #23461 from kamipo/prepared_statements_for_mysql2_adapterJeremy Daer2016-04-236-60/+165
|\ \ | |/ |/|
| * Add prepared statements support for `Mysql2Adapter`Ryuta Kamizono2016-04-216-61/+164
* | Merge pull request #24701 from prathamesh-sonpatki/deprecate-request_via_redi...Guillermo Iguaran2016-04-242-8/+11
|\ \
| * | Deprecate `request_via_redirect` method.Prathamesh Sonpatki2016-04-242-8/+11
* | | Merge pull request #24708 from kamipo/move_select_rows_implementation_to_supe...Jeremy Daer2016-04-232-5/+1
|\ \ \
| * | | Move `select_rows` implementation to super classRyuta Kamizono2016-04-242-5/+1
* | | | Merge pull request #24705 from kamipo/add_nodoc_to_insert_versions_sqlGuillermo Iguaran2016-04-232-2/+2
|\ \ \ \
| * | | | Add `:nodoc:` to `insert_versions_sql` [ci skip]Ryuta Kamizono2016-04-242-2/+2
| |/ / /
* | | | Merge pull request #24706 from kamipo/remove_in_doc_about_mysql_versions_below_5Guillermo Iguaran2016-04-231-3/+1
|\ \ \ \
| * | | | Remove in the doc about MySQL versions below 5 [ci skip]Ryuta Kamizono2016-04-241-3/+1
| |/ / /
* | | | Merge pull request #24707 from kamipo/move_require_ipaddr_to_oid_cidrGuillermo Iguaran2016-04-232-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Move `require 'ipaddr'` in `postgresql/oid/cidr.rb`Ryuta Kamizono2016-04-242-2/+2
|/ / /
* | | Merge pull request #24704 from graemeboy/masterप्रथमेश Sonpatki2016-04-241-1/+1
|\ \ \
| * | | Fix typo in ActiveJob #retry_job docGraeme Boy2016-04-231-1/+1
|/ / /
* | | Merge pull request #24703 from vipulnsward/24695-handle-nilsSean Griffin2016-04-232-0/+10
|\ \ \
| * | | Followup of #15771Vipul A M2016-04-242-0/+10
* | | | Share lock: avoid livelock due to exclusive thread sleeping before waiting th...Jeremy Daer2016-04-231-0/+1
* | | | Merge pull request #24699 from vipulnsward/to_time_cleanupAndrew White2016-04-232-5/+5
|\ \ \ \
| * | | | Follow up of https://github.com/rails/rails/commit/c9c5788a527b70d7f983e2b4b4...Vipul A M2016-04-242-5/+5
|/ / / /
* | | | Make getlocal and getutc always return instances of TimeAndrew White2016-04-236-23/+71
* | | | Add DateTime#subsecAndrew White2016-04-233-0/+16
* | | | Change Time#sec_fraction to use subsecAndrew White2016-04-232-2/+16
* | | | Add additional aliases for DateTime#utcAndrew White2016-04-232-0/+7
* | | | Add CHANGELOG entry for #24700Andrew White2016-04-231-0/+5
* | | | Add Time#sec_fractionAndrew White2016-04-232-0/+11
* | | | Merge pull request #24700 from yui-knk/refactor_localtimeAndrew White2016-04-232-11/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Move `DateTime#getlocal` to `/core_ext/date_time/calculations.rb`yui-knk2016-04-232-11/+12
|/ / /
* | | Add compatibility for Ruby 2.4 `to_time` changesAndrew White2016-04-2316-7/+248
* | | Merge pull request #24697 from tomkadwill/action_pack_typos_2Vipul A M2016-04-234-10/+10
|\ \ \ | |/ / |/| |
| * | Actionpack documentation typos [ci skip]Tom Kadwill2016-04-234-10/+10
* | | Schema load: Fix dupe version insertJeremy Daer2016-04-221-1/+1
* | | Merge pull request #24693 from vipulnsward/fix-test-nameArthur Nogueira Neves2016-04-221-1/+1
|\ \ \
| * | | Fix test nameVipul A M2016-04-231-1/+1
|/ / /
* | | Merge pull request #24685 from vipulnsward/sqlite-compat-for-multi-insertJeremy Daer2016-04-224-4/+43
|\ \ \
| * | | https://github.com/rails/rails/commit/42dd2336b31a8d98776d039a2b9fd7f834156a7...Vipul A M2016-04-234-4/+43
* | | | Do not attempt to return connection with open transaction to pool (#24610)Sean Griffin2016-04-222-7/+10
* | | | fix boot performance issueAaron Patterson2016-04-221-12/+10
* | | | Merge pull request #24686 from javiervidal/broken-links-in-3-0-releases-notesVipul A M2016-04-221-3/+2
|\ \ \ \
| * | | | Fix broken links in 'Ruby on Rails 3.0 Release Notes' [ci skip]Javier Vidal2016-04-221-3/+2
|/ / / /
* | | | Change definition of what async means for an Active Job Job [ci skip]Vipul A M2016-04-221-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | - [ci skip] Active Job Async doesn't support to Async feature as per it's def...Mohit Natoo2016-04-221-1/+2