Permalink
Commits on Dec 7, 2012
  1. Fixed #reverse_order incorect behavior

    shemerey committed Nov 15, 2012
    Fixed incorrect behavior in situations when the string containing function comes in method order. for example SUBSTR()
    
      Sybase:     SUBSTR(field, 1, 10)
      MySql:      SUBSTR(field, 1, 10)
      Postgresql: SUBSTR(field, 1, 10)
      Sqlite:     SUBSTR(field, 1, 10)
      Oracle:     SUBSTR(field, 1, 10)
      DB2:        SUBSTR(field, 1, 10)
    
      “,” was used as means for dividing fields where sorting takes place, as a result of that invalid sql was generated
      example:
          Post.order('SUBSTR(name, 1, 10)').reverse_order.to_sql
      expected:   #=> "SELECT \"posts\".* FROM \"posts\"   ORDER BY SUBSTR(name, 1, 10) DESC"
      got:        #=> "SELECT \"posts\".* FROM \"posts\"   ORDER BY SUBSTR(name DESC, 1 DESC, 10) DESC"
    
    This fixes the incorrect behavior. for that purpose i added private method (#split_order_expressions)
    that split only by expected "," Other behavior was not affected.
Commits on Nov 16, 2012
  1. Merge pull request rails#8234 from kentaro/bundler-1.2.2

    rafaelfranca committed Nov 16, 2012
    Updated dependency on bundler to ~> 1.2.2
  2. Refactor url methods a bit

    carlosantoniodasilva committed Nov 16, 2012
    Use if..else conditions instead of return guards.
    Use _ for not used arguments when iterating.
    Set the path variable directly instead of using an empty string and <<.
  3. Fix failing template tests

    carlosantoniodasilva committed Nov 16, 2012
    Introduced in 4a4de56.
  4. Merge pull request rails#8236 from marcandre/use_div

    fxn committed Nov 16, 2012
    Use div
  5. Simplify (and optimize)

    marcandre committed Nov 16, 2012
  6. Merge pull request rails#8235 from tilsammans/dont_escape_actionmaile…

    josevalim committed Nov 16, 2012
    …r_when_plaintext
    
    Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`
  7. Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`.

    tilsammans committed Nov 16, 2012
    This is a list of mime types where template text is not html escaped
    by default. It prevents `Jack & Joe` from rendering as
    `Jack &amp; Joe` for the whitelisted mime types. The default whitelist
    contains text/plain.
    
    This follows a whitelist approach where plain text templates are
    not escaped, and all the others (json, xml) are. The mime type is
    assumed to be set by the abstract controller.
  8. Remove extra whitespace

    spastorino committed Nov 16, 2012
Commits on Nov 15, 2012
  1. Merge pull request rails#8112 from rails/encrypted_cookies

    spastorino committed Nov 15, 2012
    Encrypted cookies
  2. Merge pull request rails#8219 from nikitug/threadsafe_xmlmini_with_ba…

    rafaelfranca committed Nov 15, 2012
    …ckend
    
    Make XmlMini.with_backend usable with threads
    
    Conflicts:
    	activesupport/CHANGELOG.md
  3. Make XmlMini.with_backend usable with threads

    nikitug committed Nov 14, 2012
    `XmlMini.with_backend` now may be safely used with threads:
    
      Thread.new do
        XmlMini.with_backend("REXML") { rexml_power }
      end
      Thread.new do
        XmlMini.with_backend("LibXML") { libxml_power }
      end
    
    Each thread will use it's own backend.
  4. let remove_constant still delete Kernel#autoload constants [rounds ra…

    fxn committed Nov 15, 2012
    …ils#8213]
    
    The method #remove_const does not load the file, so we
    can still remove the constant.
  5. Merge pull request rails#8222 from marcandre/avoid_slash

    rafaelfranca committed Nov 15, 2012
    Avoid using Integer#/, as it is redefined by the 'mathn' stdlib
Commits on Nov 14, 2012
  1. Merge pull request rails#8216 from trevorturk/master

    rafaelfranca committed Nov 14, 2012
    Use BCrypt's MIN_COST in the test environment for speedier tests
  2. Merge pull request rails#8218 from DawidJanczak/form-tag-doc

    carlosantoniodasilva committed Nov 14, 2012
    [ci skip] Correct examples for form_tag helper.
    
    Conflicts:
    	actionpack/lib/action_view/helpers/form_tag_helper.rb