aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #24715 from vipulnsward/nodoc-st-poolKasper Timm Hansen2016-04-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | :nodoc: internal StatementPool class
| * | | | | | | :nodoc: internal StatementPool class.Vipul A M2016-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #24712 from vipulnsward/23461-release-notesKasper Timm Hansen2016-04-241-3/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add #23461 to release notes
| * | | | | | | Add #23461 to release notesVipul A M2016-04-241-3/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | 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` now
| * | | | | | | Fix broken build, channel files are also included in `bin/rails stats` nowPrathamesh Sonpatki2016-04-241-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/24709.
* | | | | | | Merge pull request #24709 from y-yagi/add_channels_files_in_stats_taskJeremy Daer2016-04-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add channels files in `stats` task
| * | | | | | | 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`
| * | | | | | | Add prepared statements support for `Mysql2Adapter`Ryuta Kamizono2016-04-216-61/+164
| | | | | | | |
* | | | | | | | Merge pull request #24701 from ↵Guillermo Iguaran2016-04-242-8/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/deprecate-request_via_redirect Deprecate `request_via_redirect` method.
| * | | | | | | | Deprecate `request_via_redirect` method.Prathamesh Sonpatki2016-04-242-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/issues/18693. - I think we missed deprecating `request_via_redirect` in that pull request. - Originally requested by DHH here https://github.com/rails/rails/issues/18333.
* | | | | | | | | Merge pull request #24708 from ↵Jeremy Daer2016-04-232-5/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/move_select_rows_implementation_to_super_class Move `select_rows` implementation to super class
| * | | | | | | | | 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]
| * | | | | | | | | | Add `:nodoc:` to `insert_versions_sql` [ci skip]Ryuta Kamizono2016-04-242-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #24685. `insert_versions_sql` is not public API.
* | | | | | | | | | 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]
| * | | | | | | | | | Remove in the doc about MySQL versions below 5 [ci skip]Ryuta Kamizono2016-04-241-3/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #23458. Active Record supports MySQL >= 5.0 now.
* | | | | | | | | | 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`
| * | | | | | | | | Move `require 'ipaddr'` in `postgresql/oid/cidr.rb`Ryuta Kamizono2016-04-242-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | `IPAddr` is used in `OID::Cidr`.
* | | | | | | | | Merge pull request #24704 from graemeboy/masterप्रथमेश Sonpatki2016-04-241-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix typo in ActiveJob #retry_job doc
| * | | | | | | | | 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 #15771
| * | | | | | | | | Followup of #15771Vipul A M2016-04-242-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we handle explicitly passed nil's to lock_version as well. An explicitly passed nil value is now converted to 0 on LockingType, so that we don't end up with ActiveRecord::StaleObjectError in update record optimistic locking Fixes #24695
* | | | | | | | | | Share lock: avoid livelock due to exclusive thread sleeping before waiting ↵Jeremy Daer2016-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threads wake
* | | | | | | | | | Merge pull request #24699 from vipulnsward/to_time_cleanupAndrew White2016-04-232-5/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Follow up of https://github.com/rails/rails/commit/c9c5788a527b70d7f9…
| * | | | | | | | | | Follow up of ↵Vipul A M2016-04-242-5/+5
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/c9c5788a527b70d7f983e2b4b47e3afd863d9f48 [ci skip]
* | | | | | | | | | Make getlocal and getutc always return instances of TimeAndrew White2016-04-236-23/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously these methods could return either a DateTime or a Time depending on how the ActiveSupport::TimeWithZone instance had been constructed. Changing to always return an instance of Time eliminates a possible stack level too deep error in to_time where it was wrapping a DateTime instance. As a consequence of this the internal time value is now always an instance of Time in the UTC timezone, whether that's as the UTC time directly or a representation of the local time in the timezone. There should be no consequences of this internal change and if there are it's a bug due to leaky abstractions.
* | | | | | | | | | Add DateTime#subsecAndrew White2016-04-233-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirrors the Time#subsec method by returning the fraction of the second as a Rational.
* | | | | | | | | | Change Time#sec_fraction to use subsecAndrew White2016-04-232-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time instances can have fractional parts smaller than a nanosecond.
* | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirrors the DateTime#sec_fraction method by returning the fraction of the second as a Rational.
* | | | | | | | | | Merge pull request #24700 from yui-knk/refactor_localtimeAndrew White2016-04-232-11/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Move `DateTime#getlocal` to `/core_ext/date_time/calculations.rb`
| * | | | | | | | | Move `DateTime#getlocal` to `/core_ext/date_time/calculations.rb`yui-knk2016-04-232-11/+12
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `DateTime#getlocal` is newly added public API. It's responsible is same as `DateTime#utc`, so `calculations.rb` is a best plase to define this method. For keeping consistency with `DateTime#utc`, defines `#localtime` and defines `getlocal` as an alias method.
* | | | | | | | | Add compatibility for Ruby 2.4 `to_time` changesAndrew White2016-04-2316-7/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4 the `to_time` method for both `DateTime` and `Time` will preserve the timezone of the receiver when converting to an instance of `Time`. Since Rails 5.0 will support Ruby 2.2, 2.3 and later we need to introduce a compatibility layer so that apps that upgrade do not break. New apps will have a config initializer file that defaults to match the new Ruby 2.4 behavior going forward. For information about the changes to Ruby see: https://bugs.ruby-lang.org/issues/12189 https://bugs.ruby-lang.org/issues/12271 Fixes #24617.
* | | | | | | | | Merge pull request #24697 from tomkadwill/action_pack_typos_2Vipul A M2016-04-234-10/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Actionpack documentation typos [ci skip]
| * | | | | | | | Actionpack documentation typos [ci skip]Tom Kadwill2016-04-234-10/+10
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Schema load: Fix dupe version insertJeremy Daer2016-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re. 6e098284e97250eaed6f30f5c7c362d87da986b0
* | | | | | | | Merge pull request #24693 from vipulnsward/fix-test-nameArthur Nogueira Neves2016-04-221-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix test name
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully fallback on version migrations for sqlite < 3.7.11
| * | | | | | | | https://github.com/rails/rails/commit/42dd2336b31a8d98776d039a2b9fd7f834156a ↵Vipul A M2016-04-234-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78 changed INSERT INTO versions to run in 1 single query. This breaks for sqlite versions < 3.7.11, which is especially the case on Ubuntu 12.04 LTS, that has SQLite version 3.7.9 as default. So we check for support for multi insert, before performing single query inserts, else fallback to older version of running multiple queries. [Vipul A M & Yasuo Honda]
* | | | | | | | | Do not attempt to return connection with open transaction to pool (#24610)Sean Griffin2016-04-222-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the query cache completes, if Active Record is still inside of a transaction, it is because the transaction is meant to be left open above this unit of work (such as transactional fixtures in tests). There were several tests around the behavior of "tests" that were invalid, as tests are not run through the executor. They have been changed to reflect the new behavior, which is closer to what actually occurs in Rails tests. Fixes #23989 Fixes #24491 Close #24500
* | | | | | | | | fix boot performance issueAaron Patterson2016-04-221-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slight refactor to improve boot performance on some Ruby implementations (for now).
* | | | | | | | | 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]
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Change definition of what async means for an Active Job Job [ci skip]
| * | | | | | | - [ci skip] Active Job Async doesn't support to Async feature as per it's ↵Mohit Natoo2016-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | definition. - [ci skip] Active Job Async doesn't support to Async feature as per it's definition. - [ci skip] Active Job Async doesn't support to Async feature as per it's definition. - [ci skip] Active Job Async doesn't support to Async feature as per it's definition. - [ci skip] Active Job Async doesn't support to Async feature as per it's definition.
* | | | | | | | Merge pull request #24681 from tcopeland/not_example_can_demonstrate_inequalityRichard Schneeman2016-04-211-3/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Combine inequality and equality and add SQL examples [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:08:15 +0000