Skip to content
Commits on Jun 26, 2016
  1. @rafaelfranca
  2. @rafaelfranca

    Merge pull request #25534 from kamipo/remove_conflict_line

    Remove conflict line [ci skip]
    rafaelfranca committed on GitHub Jun 26, 2016
  3. @kamipo

    Remove conflict line [ci skip]

    kamipo committed Jun 27, 2016
  4. @vijaydev

    Merge branch 'master' of github.com:rails/docrails

    Conflicts:
    	actioncable/README.md
    vijaydev committed Jun 26, 2016
  5. @kaspth

    Merge pull request #25533 from infertux/fix_typo

    Fix typo in exception class name
    kaspth committed on GitHub Jun 26, 2016
  6. @infertux
  7. @chancancode

    Merge pull request #25526 from tricknotes/pathname-as-json

    Define `Pathname#as_json`
    chancancode committed on GitHub Jun 26, 2016
  8. @maclover7

    Merge pull request #25530 from y-yagi/update_routes_example

    remove unecessary comments [ci skip]
    maclover7 committed on GitHub Jun 25, 2016
  9. @y-yagi

    remove unecessary comments [ci skip]

    These comments were removed in 8b69f1e.
    y-yagi committed Jun 26, 2016
Commits on Jun 25, 2016
  1. @sgrif

    Merge pull request #25524 from kamipo/remove_unnecessary_assert_valid…

    …_default
    
    Remove unnecessary `assert_valid_default`
    sgrif committed on GitHub Jun 25, 2016
  2. @sgrif

    Merge pull request #25528 from Gaurav2728/test_may_not_using_these_files

    client test have not using Pathname and hashwithindifferent access
    sgrif committed on GitHub Jun 25, 2016
  3. @Gaurav2728
  4. @robin850

    Tiny documentation fixes [ci skip]

    Fix a tiny typo and vertical-align some return results in the
    ActiveModel::Errors documentation.
    robin850 committed Jun 25, 2016
  5. @tricknotes

    Define `Pathname#as_json`

    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"}
    ```
    tricknotes committed Jun 25, 2016
  6. @kamipo

    Remove unnecessary `assert_valid_default`

    This was added at c7c3f73 but it never raised because MySQL cannot
    create text/blob columns with a default value.
    kamipo committed Jun 25, 2016
  7. @chancancode

    Merge pull request #25350 from tricknotes/uri-generic-as-json

    Define `URI::Generic#as_json`
    chancancode committed on GitHub Jun 25, 2016
  8. @kaspth

    Extract method to share path expansion logic.

    Then just yield the location for the place where we need some extra processing.
    kaspth committed Jun 25, 2016
  9. @kaspth

    Simplify `as` passed check.

    `if !var.nil?` is the same as just `if var`
    kaspth committed Jun 25, 2016
  10. @kaspth

    Merge pull request #25435 from y-yagi/make_as_option_work_with_get_pa…

    …rameters
    
    make `as` option work with get parameters
    kaspth committed on GitHub Jun 25, 2016
  11. @tricknotes

    Define `URI::Generic#as_json`

    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)"}}}
    ```
    tricknotes committed Jun 11, 2016
  12. @chancancode

    Merge pull request #23011 from arnvald/bugfix/correctly_parse_date

    Use correct timezone when parsing date in json
    chancancode committed Jun 25, 2016
  13. @y-yagi

    make `as` option work with get parameters

    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.
    y-yagi committed Jun 18, 2016
  14. @chancancode

    Merge pull request #25287 from marekkirejczyk/fix_25267

    Make select_year work with include_position: true option, fix #25267
    chancancode committed on GitHub Jun 25, 2016
Commits on Jun 24, 2016
  1. @maclover7

    Merge pull request #25476 from maclover7/jm-docs-dep-loading

    Update grammar for `config.enable_dependency_loading` docs
    maclover7 committed on GitHub Jun 24, 2016
  2. @maclover7
  3. @maclover7

    Merge pull request #25517 from alexcameron89/per_thread_registry

    [ci skip] Add link reference in ActiveSupport::PerThreadRegistry
    maclover7 committed on GitHub Jun 24, 2016
  4. @alexcameron89
  5. @kaspth

    Merge pull request #25514 from maclover7/jm-ar-nodoc

    nodoc `ActiveRecord::AttributeSet::YAMLEncoder`
    kaspth committed on GitHub Jun 24, 2016
  6. @maclover7

    nodoc `ActiveRecord::AttributeSet::YAMLEncoder`

    As mentioned in 7b86ea6, this is an
    internal class.
    
    [ci skip]
    
    r? @sgrif
    maclover7 committed Jun 24, 2016
  7. @maclover7

    Revert "[ci skip] better docs for ActiveRecord::AttributeSet::YAMLEnc…

    …oder#decode"
    
    This reverts commit 7ea502a, per
    internal discussion with @sgrif -- this is documenting the
    implementation of a class that isn't intended to be public API.
    maclover7 committed Jun 24, 2016
  8. @sgrif

    Merge pull request #25506 from y-yagi/return_correct_from_enum_type

    return correct type from `EnumType`
    sgrif committed on GitHub Jun 24, 2016
  9. @y-yagi
  10. @vipulnsward

    Merge pull request #25470 from alexcameron89/master

    [ci skip] Add additional documentation to ActiveModel::Errors
    vipulnsward committed on GitHub Jun 24, 2016
  11. @rafaelfranca

    Merge pull request #25502 from Edouard-chin/exclusive-scope-test-residue

    Removed a forgotten `with_exclusive_scope` test:
    rafaelfranca committed on GitHub Jun 24, 2016
  12. @Edouard-chin

    Removed a forgotten `with_exclusive_scope` test:

    - `with_exclusive_scope` was removed in this commit d242e46
    Edouard-chin committed Jun 24, 2016
Something went wrong with that request. Please try again.