Permalink
Commits on May 16, 2014
Commits on May 15, 2014
  1. Merge pull request #15118 from khelben/head_with_status_action_stack_…

    …level_too_deep
    
    fixes stack level too deep exception on action named 'status' rendering 'head :ok'
    rafaelfranca committed May 15, 2014
  2. fixes stack level too deep exception on action named 'status' returni…

    …ng 'head :ok'
    Christiaan Van den Poel committed with khelben May 15, 2014
  3. Merge pull request #15121 from skarpesh/rfc4791-methods

    Add RFC 4791 MKCALENDAR method
    rafaelfranca committed May 15, 2014
  4. Merge pull request #14791 from asn62/mysql_double_bug

    Changed extract_limit in class Column to return correct mysql float and
    double limits
    matthewd committed May 15, 2014
  5. Add RFC4791 MKCALENDAR method

    skarpiesz committed May 15, 2014
  6. Revert "Remove ruby-head from allow_failures matrix"

    This reverts commit 5d2d301.
    spastorino committed May 15, 2014
  7. Merge pull request #15116 from tgxworld/remove_unused_method_in_test

    Remove unused method in RouteSet test.
    spastorino committed May 15, 2014
  8. Only path requirements are relevant to optimized urls

    The bit of URL generation that is optimized is the generation of
    the path so things like :host, :port, etc. are irrelevant.
    pixeltrix committed May 15, 2014
  9. ✂️

    rafaelfranca committed May 15, 2014
  10. Methods of these modules are internal

    They should not be used on people application so they should not be
    present on the API documentation.
    rafaelfranca committed May 15, 2014
  11. Merge pull request #15088 from kares/shareable-modules

    [postgres] remove (outer) sub-class declarations with nested modules/classes
    rafaelfranca committed May 15, 2014
  12. Don't use Active Support where it is not needed.

    parent_name is a string of nil, never a blank string so we don't need to
    use presence.
    rafaelfranca committed May 15, 2014
  13. Merge pull request #14871 from kassio/kb-fixes-namespaced-habtm

    Fix how to compute class name on habtm namespaced.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed May 15, 2014
Commits on May 14, 2014
  1. Merge pull request #15078 from nbudin/fix_merger_filter_binds_compari…

    …son_master
    
    Make filter_binds filter out symbols that are equal to strings
    
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed May 14, 2014
  2. Make filter_binds filter out symbols that are equal to strings

    ActiveRecord::Relation::Merger's filter_binds method does not filter out bind
    variables when one of the attribute nodes has a string name, but the other has
    a symbol name, even when those names are actually equal.
    
    This can result in there being more bind variables than placeholders in the
    generated SQL.  This is particularly an issue for PostgreSQL, where this is
    treated as an error.
    
    This patch changes the filter_binds method to make it convert both attribute
    names to strings before comparing.
    nbudin committed May 12, 2014
  3. Merge pull request #14137 from dasch/better-fragment-cache-instrument…

    …ation
    
    Add controller and action name to the fragment caching instrumentation payload
    
    Conflicts:
    	actionpack/CHANGELOG.md
    rafaelfranca committed May 14, 2014
  4. Merge pull request #15070 from ayamomiji/sse-patch

    Add multiple lines message support for SSE module
    tenderlove committed May 14, 2014
  5. Merge pull request #15110 from kuldeepaggarwal/fix-warning

    remove warning `ambiguous first argument; put parentheses or even spaces`
    rafaelfranca committed May 14, 2014
  6. Merge pull request #15074 from kuldeepaggarwal/docs-changes

    Add missing information, ref[#522c0fd]
    rafaelfranca committed May 14, 2014
  7. Merge pull request #15108 from arthurnn/i18n_master

    Use i18n master to run tests
    rafaelfranca committed May 14, 2014
  8. Merge pull request #15096 from robin850/patch-20

    Update Redcarpet to 3.1.2
    rafaelfranca committed May 14, 2014
  9. Update Redcarpet to 3.1.2

    This version fixes an API breakage between 3.0 and 3.1 ; the header
    method's arity should not have changed.
    
    [ci skip]
    robin850 committed May 13, 2014
  10. We need an explicit return

    If we don't return early Ruby will memoize the value of the prefix of
    the parent class what will make the subsequent searchs to not work as
    expected.
    
    If the early return we are avoiding the memoization.
    
    But when using the deprecated path we need to memoize the value, so we
    are not using early return for the deprecated path.
    rafaelfranca committed May 14, 2014