1. 22 4月, 2014 1 次提交
  2. 21 4月, 2014 2 次提交
    • A
      Merge branch 'master' into adequaterecord · 94cd2f7f
      Aaron Patterson 提交于
      * master: (74 commits)
        [ci skip] builtin -> built-in
        Fix code indentation and improve formatting
        Grammar fix in Getting Started Guide
        Make URL escaping more consistent
        Optimize URI escaping
        Always escape string passed to url helper.
        Remove statement assuming coffee shop/public space wifi is inherently insecure
        Don't rely on Arel master in bug report template [ci skip]
        wrap methods in backticks [ci skip]
        "subhash" --> "sub-hash"
        multibyte_conformance.rb --> multibyte_conformance_test.rb
        Fix inconsistent behavior from String#first/#last
        `@destroyed` should always be set to `false` when an object is duped.
        remove warning `warning: ambiguous first argument; put parentheses or even spaces`
        :uglify -> :uglifier
        Regression test for irregular inflection on has_many
        Singularize association names before camelization
        Fix spelling and proper nouns
        Optimize select_value, select_values, select_rows and dry up checking whether to exec with cache for Postgresql adapter
        Include default rails protect_from_forgery with: :exception
        ...
      
      Conflicts:
      	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
      	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
      94cd2f7f
    • R
      Merge pull request #14820 from akshay-vishnoi/doc_changes · 86b02826
      Richard Schneeman 提交于
      [ci skip] builtin -> built-in
      86b02826
  3. 20 4月, 2014 12 次提交
  4. 19 4月, 2014 13 次提交
  5. 18 4月, 2014 12 次提交