aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25123 from bf4/remove_problematic_mime_testRafael França2016-06-271-3/+3
|\ | | | | Modifies mime-registration test not to interfere with real mime types
| * Modifies mime-registration test not to interfere with real mime typesBenjamin Fleischer2016-05-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests introduced in https://github.com/rails/rails/pull/23816/files#diff-384a5a15d8d53de799fb6541688ea5f9R153 register the JSON API media type `application/vnd.api+json` with `Mime[:json]`. The JSON API media type should not be registered with `Mime[:json]`, as discussed in #23712. Moreover, since the actual mime type used in the test is incidental, I've changed this to a valid, but fictional `applcation/vnd.rails+json`. These tests were causing failures in https://github.com/rails/rails/pull/25050#issuecomment-221092934 where `Mime[:jsonapi]` is being added, so that JSON API request params are parsed with the JSONAPI gem.
* | Merge pull request #25192 from vipulnsward/25185-default-key-lengthAaron Patterson2016-06-283-9/+7
|\ \ | | | | | | Fix default key length on cipher
| * | We default to using aes-256-cbc as our verification/signing cipher. It can ↵Vipul A M2016-06-273-9/+7
|/ / | | | | | | | | | | | | | | | | | | accept key lengths of 128, 192 or 256-bit, whereas currently we were providing twice the acceptable value. ruby < 2.4 allowed accepting these values, as extra key bits were ignored. Since https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1 this now has a strict checking on key length. Default to key length 32 bytes, to match the compatible length for aes-256-cbc Fixes #25185
* | Merge pull request #25545 from derekprior/dp-simple-format-docsVipul A M2016-06-271-4/+5
|\ \ | | | | | | Document `simple_format` handling of `\r`
| * | Document `simple_format` handling of `\r`Derek Prior2016-06-271-4/+5
|/ / | | | | | | | | | | | | `simple_format` handles `\r\n` and `\r` but previously did not document this behavior. The handling is done with a `gsub` in `split_paragraphs`. [ci skip]
* | Merge pull request #25543 from marekkirejczyk/tag_builder_25195Kasper Timm Hansen2016-06-276-63/+364
|\ \ | | | | | | New syntax for tag helpers i.e. tag.br instead of tag('br') #25195
| * | New syntax for tag helpers i.e. tag.br instead of tag(br) #25195Marek2016-06-276-63/+364
|/ /
* | Clearify CHANGELOG for #23011 [ci skip]Godfrey Chan2016-06-272-4/+8
| |
* | Add #16917 to 5.0.0 release notesGodfrey Chan2016-06-271-0/+7
| |
* | Merge pull request #25536 from alexcameron89/update-transactionsJon Moss2016-06-271-4/+4
|\ \ | | | | | | [ci skip] Clarify DDL term in ActiveRecord::Transactions
| * | [ci skip] Clarify DDL term in ActiveRecord::TransactionsAlex Kitchens2016-06-271-4/+4
|/ /
* | Fix Action Cable README [ci skip]Rafael Mendonça França2016-06-261-5/+14
| |
* | Merge pull request #25534 from kamipo/remove_conflict_lineRafael França2016-06-261-1/+0
|\ \ | | | | | | Remove conflict line [ci skip]
| * | Remove conflict line [ci skip]Ryuta Kamizono2016-06-271-1/+0
|/ /
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-263-6/+151
|\ \ | | | | | | | | | | | | Conflicts: actioncable/README.md
| * | Fix and make example generic in README as well [ci skip]Vipul A M2016-06-151-3/+3
| | |
| * | Make log tags example for ACa more generic and not BC specific [ci skip]Vipul A M2016-06-151-3/+4
| | |
| * | [ci skip] When instance_reader is false, attribute can still be assigned by ↵Prathamesh Sonpatki2016-06-151-1/+2
| | | | | | | | | | | | the instance objects
| * | Action Cable routes are enabled by default now [ci skip]Prathamesh Sonpatki2016-06-101-5/+0
| | | | | | | | | | | | - Followup of https://github.com/rails/rails/commit/8b69f1eeba753c38364fb88136b2503480f2de1d.
| * | Expand on AC introduction list [ci skip]Vipul A M2016-06-071-0/+2
| | |
* | | Merge pull request #25533 from infertux/fix_typoKasper Timm Hansen2016-06-261-1/+1
|\ \ \ | | | | | | | | Fix typo in exception class name
| * | | Fix typo in exception class nameCédric Félizard2016-06-261-1/+1
|/ / /
* | | Merge pull request #25526 from tricknotes/pathname-as-jsonGodfrey Chan2016-06-262-0/+9
|\ \ \ | | | | | | | | Define `Pathname#as_json`
| * | | Define `Pathname#as_json`Ryunosuke Sato2016-06-252-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Pathname object is converted as JSON, it should be a string that means itself. Expected: ``` >> Pathname.new('/path/to/somewhere.txt').as_json "/path/to/somewhere.txt" ``` Actual: ``` >> Pathname.new('/path/to/somewhere.txt').as_json {"path"=>"/path/to/somewhere.txt"} ```
* | | | Merge pull request #25530 from y-yagi/update_routes_exampleJon Moss2016-06-251-5/+0
|\ \ \ \ | | | | | | | | | | remove unecessary comments [ci skip]
| * | | | remove unecessary comments [ci skip]yuuji.yaginuma2016-06-261-5/+0
| | | | | | | | | | | | | | | | | | | | These comments were removed in 8b69f1e.
* | | | | Merge pull request #25524 from kamipo/remove_unnecessary_assert_valid_defaultSean Griffin2016-06-252-14/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unnecessary `assert_valid_default`
| * | | | | Remove unnecessary `assert_valid_default`Ryuta Kamizono2016-06-252-14/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This was added at c7c3f73 but it never raised because MySQL cannot create text/blob columns with a default value.
* | | | | Merge pull request #25528 from Gaurav2728/test_may_not_using_these_filesSean Griffin2016-06-251-3/+0
|\ \ \ \ \ | |_|/ / / |/| | | | client test have not using Pathname and hashwithindifferent access
| * | | | client test have not using Pathname and hashwithindifferent accessGaurav Sharma2016-06-261-3/+0
|/ / / /
* / / / Tiny documentation fixes [ci skip]Robin Dupret2016-06-252-8/+8
|/ / / | | | | | | | | | | | | Fix a tiny typo and vertical-align some return results in the ActiveModel::Errors documentation.
* | | Merge pull request #25350 from tricknotes/uri-generic-as-jsonGodfrey Chan2016-06-252-0/+9
|\ \ \ | | | | | | | | Define `URI::Generic#as_json`
| * | | Define `URI::Generic#as_json`Ryunosuke Sato2016-06-252-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the URI object is converted as JSON, it is expected that it is a string that means its URI. Expected: ``` >> URI.parse('http://example.com').as_json "http://example.com" ``` Actual: ``` >> URI.parse('http://example.com').as_json {"scheme"=>"http", "user"=>nil, "password"=>nil, "host"=>"example.com", "port"=>80, "path"=>"", "query"=>nil, "opaque"=>nil, "fragment"=>nil, "parser"=> {"regexp"=> {"SCHEME"=>"(?-mix:\\A[A-Za-z][A-Za-z0-9+\\-.]*\\z)", "USERINFO"=>"(?-mix:\\A(?:%\\h\\h|[!$&-.0-;=A-Z_a-z~])*\\z)", "HOST"=> "(?-mix:\\A(?:(?<IP-literal>\\[(?:(?<IPv6address>(?:\\h{1,4}:){6}(?<ls32>\\h{1,4}:\\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5]|\\d)\\.\\g<dec-octet>\\.\\g<dec-octet>\\.\\g<dec-octet>))|::(?:\\h{1,4}:){5}\\g<ls32>|\\h{,4}::(?:\\h{1,4}:){4}\\g<ls32>|(?:(?:\\h{1,4}:)?\\h{1,4})?::(?:\\h{1,4}:){3}\\g<ls32>|(?:(?:\\h{1,4}:){,2}\\h{1,4})?::(?:\\h{1,4}:){2}\\g<ls32>|(?:(?:\\h{1,4}:){,3}\\h{1,4})?::\\h{1,4}:\\g<ls32>|(?:(?:\\h{1,4}:){,4}\\h{1,4})?::\\g<ls32>|(?:(?:\\h{1,4}:){,5}\\h{1,4})?::\\h{1,4}|(?:(?:\\h{1,4}:){,6}\\h{1,4})?::)|(?<IPvFuture>v\\h+\\.[!$&-.0-;=A-Z_a-z~]+))\\])|\\g<IPv4address>|(?<reg-name>(?:%\\h\\h|[!$&-.0-9;=A-Z_a-z~])*))\\z)", "ABS_PATH"=> "(?-mix:\\A\\/(?:%\\h\\h|[!$&-.0-;=@-Z_a-z~])*(?:\\/(?:%\\h\\h|[!$&-.0-;=@-Z_a-z~])*)*\\z)", "REL_PATH"=> "(?-mix:\\A(?:%\\h\\h|[!$&-.0-;=@-Z_a-z~])+(?:\\/(?:%\\h\\h|[!$&-.0-;=@-Z_a-z~])*)*\\z)", "QUERY"=>"(?-mix:\\A(?:%\\h\\h|[!$&-.0-;=@-Z_a-z~\\/?])*\\z)", "FRAGMENT"=>"(?-mix:\\A(?:%\\h\\h|[!$&-.0-;=@-Z_a-z~\\/?])*\\z)", "OPAQUE"=>"(?-mix:\\A(?:[^\\/].*)?\\z)", "PORT"=> "(?-mix:\\A[\\x09\\x0a\\x0c\\x0d ]*\\d*[\\x09\\x0a\\x0c\\x0d ]*\\z)"}}} ```
* | | | Extract method to share path expansion logic.Kasper Timm Hansen2016-06-251-11/+16
| | | | | | | | | | | | | | | | Then just yield the location for the place where we need some extra processing.
* | | | Simplify `as` passed check.Kasper Timm Hansen2016-06-251-1/+1
| | | | | | | | | | | | | | | | `if !var.nil?` is the same as just `if var`
* | | | Merge pull request #25435 from y-yagi/make_as_option_work_with_get_parametersKasper Timm Hansen2016-06-252-2/+18
|\ \ \ \ | |/ / / |/| | | make `as` option work with get parameters
| * | | make `as` option work with get parametersyuuji.yaginuma2016-06-252-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if path is a relative path, add format without the discrimination of the query. Therefore, if there is a query, format at end of the query would been added, format was not be specified correctly. This fix add format to end of path rather than query.
* | | | Merge pull request #23011 from arnvald/bugfix/correctly_parse_dateGodfrey Chan2016-06-253-7/+25
|\ \ \ \ | | | | | | | | | | | | | | | Use correct timezone when parsing date in json
| * | | | Use correct timezone when parsing date in jsonGrzegorz Witek2016-01-223-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/22171 Time specified in ISO 8601 format without `Z` should be considered as local time, yet until now it was treated as UTC. This commit fixes problem by parsing time using timezone specified in application config. The downside of this solution is performance hit (`Time.zone.parse` is ~ 1.6x slower than `Time.parse`), so maybe there's a better solution.
* | | | | Merge pull request #25287 from marekkirejczyk/fix_25267Godfrey Chan2016-06-252-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Make select_year work with include_position: true option, fix #25267
| * | | | | Make select_year work with include_position: true option, fix #25267Marek2016-06-052-1/+8
| | | | | |
* | | | | | Merge pull request #25476 from maclover7/jm-docs-dep-loadingJon Moss2016-06-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update grammar for `config.enable_dependency_loading` docs
| * | | | | | Update grammar for `config.enable_dependency_loading` docsJon Moss2016-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] r? @rafaelfranca
* | | | | | | Merge pull request #25517 from alexcameron89/per_thread_registryJon Moss2016-06-241-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ci skip] Add link reference in ActiveSupport::PerThreadRegistry
| * | | | | | [ci skip] Add link to method referenced in ActiveSupport::PerThreadRegistryAlex Kitchens2016-06-241-1/+1
|/ / / / / /
* | | | | | Merge pull request #25514 from maclover7/jm-ar-nodocKasper Timm Hansen2016-06-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | nodoc `ActiveRecord::AttributeSet::YAMLEncoder`
| * | | | | | nodoc `ActiveRecord::AttributeSet::YAMLEncoder`Jon Moss2016-06-241-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in 7b86ea6715ee987e61a7f3bd8e72b1bbfcfbbbe7, this is an internal class. [ci skip] r? @sgrif
* | | | | | Revert "[ci skip] better docs for ↵Jon Moss2016-06-241-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::AttributeSet::YAMLEncoder#decode" This reverts commit 7ea502ae141fc26b736c7a73bdf7a676b1f9fc87, per internal discussion with @sgrif -- this is documenting the implementation of a class that isn't intended to be public API.
* | | | | | Merge pull request #25506 from y-yagi/return_correct_from_enum_typeSean Griffin2016-06-242-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | return correct type from `EnumType`
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 02:38:41 +0000