aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24556 from vipulnsward/24542-changelogJeremy Daer2016-04-151-0/+6
|\ | | | | Add changelog for #24542
| * Add changelog for #24542Vipul A M2016-04-151-0/+6
| | | | | | | | [ci skip]
* | Merge pull request #24559 from vipulnsward/fix-ac-testsJeremy Daer2016-04-152-5/+3
|\ \ | | | | | | Fixed ActionCable::Connection::ClientSocketTest test
| * | - Fixed ActionCable::Connection::ClientSocketTest that was overriding ↵Vipul A M2016-04-152-5/+3
| |/ | | | | | | | | | | ActionCable::Connection::StreamTest test name - Only add attr_readers for required attributes
* | Merge pull request #24517 from estolfo/transform-keys-return-type-masterSean Griffin2016-04-152-1/+17
|\ \ | | | | | | Restore Hash#transform_keys behavior to always return a Hash instance
| * | Restore Hash#transform_keys behavior to always return a Hash instanceEmily2016-04-122-1/+17
| | |
* | | Filter scalar values when params permit hashes or arraysSean Griffin2016-04-152-1/+14
| | | | | | | | | | | | | | | | | | This brings the behavior more inline with other similar cases, such as receiving a hash when an array of scalars was expected. Prior to this commit, the key would be present, but the value would be `nil`
* | | Merge pull request #24560 from javiervidal/20160415प्रथमेश Sonpatki2016-04-151-1/+1
|\ \ \ | | | | | | | | Fix broken link in 'Ruby on Rails 4.0 Release Notes'
| * | | Fix broken link in 'Ruby on Rails 4.0 Release Notes' [ci skip]Javier Vidal2016-04-151-1/+1
|/ / /
* | | Merge pull request #24557 from y-yagi/update_example_to_specify_ac_mount_pathVipul A M2016-04-152-8/+9
|\ \ \ | |_|/ |/| | update example to specify the Action Cable mount path [ci skip]
| * | update example to specify the Action Cable mount path [ci skip]yuuji.yaginuma2016-04-152-8/+9
| | | | | | | | | | | | Follow up to 8b69f1e
* | | Merge pull request #24549 from kamipo/fix_quoted_timeJeremy Daer2016-04-142-3/+12
|\ \ \ | | | | | | | | Should keep quoting behaivor of a time column value in sqlite3 adapter
| * | | Should keep quoting behaivor of a time column value in sqlite3 adapterRyuta Kamizono2016-04-152-3/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #24542. In MySQL and PostgreSQL, a time column value is saved as ignored the date part of it. But in SQLite3, a time column value is saved as a string. We should keep previous quoting behavior in sqlite3 adapter. ``` sqlite> CREATE TABLE "foos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start" time(0), "finish" time(4)); sqlite> INSERT INTO "foos" ("start", "finish") VALUES ('2000-01-01 12:30:00', '2000-01-01 12:30:00.999900'); sqlite> SELECT "foos".* FROM "foos"; 1|2000-01-01 12:30:00|2000-01-01 12:30:00.999900 sqlite> SELECT "foos".* FROM "foos" WHERE "foos"."start" = '2000-01-01 12:30:00' LIMIT 1; 1|2000-01-01 12:30:00|2000-01-01 12:30:00.999900 sqlite> SELECT "foos".* FROM "foos" WHERE "foos"."start" = '12:30:00' LIMIT 1; sqlite> ```
* | | Merge pull request #24540 from sgrif/sg-actioncable-callbacksSean Griffin2016-04-142-5/+30
|\ \ \ | | | | | | | | Run Action Cable callbacks through the worker pool
| * | | Run Action Cable callbacks through the worker poolSean Griffin2016-04-132-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alternate implementation of #24162 with tests. The code had diverged too far on master to pull that implemenation directly. Fixes #23778 Close #24162 [Mattew Draper & Sean Griffin]
* | | | Merge pull request #24454 from iangilfillan/masterVipul A M2016-04-144-13/+15
|\ \ \ \ | |_|/ / |/| | | MariaDB documentation [ci skip]
| * | | MariaDB Documentationiangilfillan2016-04-144-13/+15
| | | |
* | | | Merge pull request #24542 from kamipo/add_quoted_timeJeremy Daer2016-04-133-1/+18
|\ \ \ \ | | | | | | | | | | Add `quoted_time` for truncating the date part of a time column value
| * | | | Add `quoted_time` for truncating the date part of a time column valueRyuta Kamizono2016-04-143-1/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context #24522. TIME column on MariaDB doesn't ignore the date part of the string when it coerces to time. ``` root@localhost [test] > CREATE TABLE `foos` (`id` int AUTO_INCREMENT PRIMARY KEY, `start` time(0), `finish` time(4)) ENGINE=InnoDB; Query OK, 0 rows affected (0.02 sec) root@localhost [test] > INSERT INTO `foos` (`start`, `finish`) VALUES ('2000-01-01 12:30:00', '2000-01-01 12:30:00.999900'); Query OK, 1 row affected, 2 warnings (0.00 sec) Note (Code 1265): Data truncated for column 'start' at row 1 Note (Code 1265): Data truncated for column 'finish' at row 1 root@localhost [test] > SELECT `foos`.* FROM `foos`; +----+----------+---------------+ | id | start | finish | +----+----------+---------------+ | 1 | 12:30:00 | 12:30:00.9999 | +----+----------+---------------+ 1 row in set (0.00 sec) root@localhost [test] > SELECT `foos`.* FROM `foos` WHERE `foos`.`start` = '2000-01-01 12:30:00' LIMIT 1; Empty set (0.00 sec) root@localhost [test] > SELECT `foos`.* FROM `foos` WHERE `foos`.`start` = '12:30:00' LIMIT 1; +----+----------+---------------+ | id | start | finish | +----+----------+---------------+ | 1 | 12:30:00 | 12:30:00.9999 | +----+----------+---------------+ 1 row in set (0.00 sec) ```
* | | | Merge pull request #24522 from vipulnsward/run-mariadb-on-travisJeremy Daer2016-04-133-4/+10
|\ \ \ \ | | | | | | | | | | Test against MariaDB 10.0
| * | | | Include running mariadb on travisVipul A M2016-04-143-4/+10
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | - Specify we want to run on latest stable ruby for mariadb - change in runs of builds Make mariadb? method publicly available
* | | | Merge pull request #24543 from prathamesh-sonpatki/fix-ap-changelogRichard Schneeman2016-04-131-2/+2
|\ \ \ \ | | | | | | | | | | [ci skip] Remove extra `so` from the Action Pack CHANGELOG
| * | | | [ci skip] Remove extra `so` from the Action Pack CHANGELOGPrathamesh Sonpatki2016-04-141-2/+2
|/ / / /
* | | | Merge pull request #24533 from vipulnsward/nodoc-versionSean Griffin2016-04-131-1/+1
|\ \ \ \ | | | | | | | | | | :nodoc: version method.
| * | | | :nodoc: version method.Vipul A M2016-04-131-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: - Its not publicly used method. - Exposing it makes an assumption that other adapters support it based on its usage - ActiveRecord::Base.connection.version [ci skip]
* | | | Merge pull request #24525 from tomkadwill/action-mailer-base-docs2Vipul A M2016-04-141-3/+3
|\ \ \ \ | | | | | | | | | | Update ActionMailer base documentation [ci skip]
| * | | | Update ActionMailer base documentation [ci skip]Tom Kadwill2016-04-131-3/+3
| | | | |
* | | | | Merge pull request #24539 from bogdan/diry-keyword-argsSean Griffin2016-04-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed bug introduced in #24519. Makes build green again
| * | | | | Fixed bug introduced in #24519. Makes build green againBogdan Gusiev2016-04-131-1/+1
| | | | | |
* | | | | | Merge pull request #24536 from vipulnsward/ruby-2-upgradingRafael França2016-04-131-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add ruby 2.2.2+ version requirement for Rails 5 apps
| * | | | | Add ruby 2.2.2+ version requirement for Rails 5 appsVipul A M2016-04-131-1/+2
| | |/ / / | |/| | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #24519 from bogdan/diry-keyword-argsJeremy Daer2016-04-131-8/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | Switch to keyword args for attribute_changed?
| * | | | Use keyword arguments to cleanup without droping performanceBogdan Gusiev2016-04-131-8/+8
| | | | |
* | | | | Properly serialize all JSON primitives in the AR JSON typeSean Griffin2016-04-134-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were assuming that the only valid types for encoding were arrays and hashes. However, any JSON primitive is an accepted value by both PG and MySQL. This does involve a minor breaking change in the handling of `default` in the schema dumper. This is easily worked around, as passing a hash/array literal would have worked fine in previous versions of Rails. However, because of this, I will not be backporting this to 4.2 or earlier. Fixes #24234
* | | | | Remove unused variableRafael Mendonça França2016-04-131-1/+0
| | | | |
* | | | | Remove time calculatiosn extensionRafael Mendonça França2016-04-131-0/+2
| | | | | | | | | | | | | | | | | | | | We are using compare_without_coercion.
* | | | | Merge pull request #24318 from bogdanvlviv/patch-1Rafael Mendonça França2016-04-122-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | extension synonyms yml and yaml
| * | | | | extension synonyms yml and yamlBogdan2016-03-272-1/+5
| | | | | |
* | | | | | Merge pull request #24524 from prathamesh-sonpatki/cablejs-for-channelsRafael França2016-04-123-0/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Generate `cable.js` file if does not exist when generating channel
| * | | | | Generate `cable.js` file if does not exist when generating channelPrathamesh Sonpatki2016-04-123-0/+22
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Before this, while generating a channel, we were not creating `cable.js` if it does not already exist. - We have similar code for application mailer here - https://github.com/rails/rails/commit/0b3ae023d27197417541932632055cd6be4810c4. - Based on the comment - https://github.com/rails/rails/issues/24418#issuecomment-205421995.
* | | | | Merge pull request #24515 from Sen-Zhang/attribute_changed_not_return_nilSean Griffin2016-04-122-3/+3
|\ \ \ \ \ | | | | | | | | | | | | prevent 'attribute_changed?' from returning nil
| * | | | | prevent 'attribute_changed?' from returning nilSen-Zhang2016-04-112-3/+3
| |/ / / /
* | | | | Merge pull request #24502 from ankit8898/freezing-dot-in-delimiter-helperRichard Schneeman2016-04-122-4/+6
|\ \ \ \ \ | | | | | | | | | | | | Lesser '.' objects for number helpers
| * | | | | Freezing couple of more string '0' & '.' and using the string appending to ↵Ankit Gupta2016-04-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | do the same string manipulation. This was we avoid the duplicate strings with freeze and append modifies existing string
| * | | | | Freezing the dots as they are causing extra string initialization on every ↵Ankit Gupta2016-04-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | iteration of calling the helper. Eases on some memory bloat
* | | | | | copy edits some comments [ci skip]Xavier Noria2016-04-121-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the fact that mtimes in the future are ignore was documented just a few lines above. Since we know this has to be done, and the code is quite clear due to variable naming, I think we can get rid of the comment in the middle of the loop and shorten it even further.
* | | | | | Merge pull request #24494 from vipulnsward/guides-changelog-passYves Senn2016-04-121-8/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Guides changelog pass [ci skip]
| * | | | | | - Add changelog for new guide: AC overview from ↵Vipul A M2016-04-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/23176 [ci skip]
| * | | | | | - Fixed changelog related to i18 key changes. Added authorVipul A M2016-04-101-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Made all sentences to end properly [ci skip]
* | | | | | | Merge pull request #24523 from BlakeMesdag/as-max_time-fix-edgesXavier Noria2016-04-122-7/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Handle max_time edge cases for epoch times and add test
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:30:38 +0000