Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 2, 2014
  1. @rafaelfranca
Commits on May 6, 2014
  1. @rafaelfranca

    Merge branch '3-2-sec' into 3-2-stable

    rafaelfranca authored
    Conflicts:
    	actionpack/CHANGELOG.md
  2. @rafaelfranca
Commits on Feb 18, 2014
  1. @rafaelfranca

    Merge branch '3-2-17' into 3-2-stable

    rafaelfranca authored
    Conflicts:
    	actionpack/CHANGELOG.md
  2. @rafaelfranca
Commits on Dec 5, 2013
  1. @carlosantoniodasilva

    Merge pull request #13183 from sorah/never_ignore_i18n_translate_rais…

    carlosantoniodasilva authored
    …e_option
    
    Escalate missing error when :raise is true in translate helper, fix regression introduced by security fix.
    
    Conflicts:
    	actionpack/CHANGELOG.md
Commits on Dec 3, 2013
  1. @tenderlove

    updating the changelog

    tenderlove authored
Commits on Oct 16, 2013
  1. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Oct 1, 2013
Commits on Sep 12, 2013
  1. @rafaelfranca

    Fix FinderMethods#last unscoped primary key

    Eugene Kalenkovich authored rafaelfranca committed
    Fixes table.joins(:relation).last(N) breaking on sqlite
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/test/cases/finder_test.rb
Commits on Sep 6, 2013
  1. @beedub

    pass the extra params to the rack test environment so that routes wit…

    beedub authored
    …h block constraints have access
Commits on Aug 24, 2013
  1. @kassio

    fix issue #11605

    kassio authored
Commits on Jul 22, 2013
  1. @rafaelfranca

    Fix actionpack CHANGELOG entry

    rafaelfranca authored
    It was included by git on the wrong release
  2. @rafaelfranca
  3. @rafaelfranca

    Update CHANGELOG entry

    rafaelfranca authored
Commits on Jul 18, 2013
  1. @907th

    Fix `assert_redirected_to` does not show user-supplied message.

    907th authored
    Issue: when `assert_redirected_to` fails due to the response redirect not
    matching the expected redirect the user-supplied message (second parameter)
    is not shown. This message is only shown if the response is not a redirect.
Commits on Jul 16, 2013
  1. @rafaelfranca
Commits on Jul 13, 2013
  1. @rafaelfranca
Commits on Jun 25, 2013
  1. @pixeltrix

    Fix shorthand routes where controller and action are in the scope

    pixeltrix authored
    Merge `:action` from routing scope and assign endpoint if both `:controller`
    and `:action` are present. The endpoint assignment only occurs if there is
    no `:to` present in the options hash so should only affect routes using the
    shorthand syntax (i.e. endpoint is inferred from the the path).
    
    Fixes #9856
    
    Backport of 37b4276
Commits on Jun 24, 2013
  1. @rafaelfranca

    Add CHANGELOG entry for #10971

    rafaelfranca authored
    [ci skip]
Commits on Jun 17, 2013
  1. @rafaelfranca

    Compare host scheme using case-insensitive regexp

    rafaelfranca authored
    Before:
    
        image_tag("HTTP://google.com")
        # => "<img alt=\"Google\" src=\"/assets/HTTP://google.com\" />"
        image_tag("http://google.com")
        # => "<img alt=\"Google\" src=\"http://google.com\" />"
    
    After:
    
        image_tag("HTTP://google.com")
        # => "<img alt=\"Google\" src=\"HTTP://google.com\" />"
        image_tag("http://google.com")
        # => "<img alt=\"Google\" src=\"http://google.com\" />"
    
    Backport of #10969
Commits on Apr 5, 2013
  1. @rafaelfranca
  2. @rmm5t

    Fix explicit names on multiple file fields

    rmm5t authored
    If a file field tag is passed the multiple option, it is turned into an
    array field (appending "[]"), but if the file field is passed an
    explicit name as an option, leave the name alone (do not append "[]").
    
    Fixes #9830
Commits on Mar 30, 2013
  1. @carlosantoniodasilva

    Fix formatting and minor review in AP changelog

    carlosantoniodasilva authored
    Sentences starting with # are considered headings.
Commits on Mar 21, 2013
  1. @rafaelfranca
Commits on Mar 20, 2013
  1. @tenderlove

    Merge branch '3-2-stable' into fredwu-slow_view_loading_fix

    tenderlove authored
    * 3-2-stable:
      Merge pull request #9802 from newsline/fix-broken-action-missing
      Remove bad changelog entry from AR [ci skip]
      Wrong exception is occured when raising no translatable exception
      Don't crash exception translation w/ nil result attribute.
    
    Conflicts:
    	actionpack/CHANGELOG.md
  2. @fredwu

    Added changelog for 687e68d

    fredwu authored
  3. @rafaelfranca

    Merge pull request #9802 from newsline/fix-broken-action-missing

    rafaelfranca authored
    Fix missing action_missing
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Conflicts:
    	actionpack/test/controller/base_test.rb
    
    Fixes #9799
Commits on Mar 19, 2013
  1. @hoffm @samsonasu

    Backport #9347 to rails 3.2

    hoffm authored samsonasu committed
Commits on Mar 18, 2013
  1. @claudiob

    Add release dates to documentation [ci skip]

    claudiob authored
    Set "March 18, 2013" as the release date for 3.2.13
  2. @carlosantoniodasilva
  3. @tenderlove

    Merge branch '3-2-13' into 3-2-stable

    tenderlove authored
    * 3-2-13:
      bumping to 3.2.13
      fix protocol checking in sanitization [CVE-2013-1857]
      JDOM XXE Protection [CVE-2013-1856]
      fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
      stop calling to_sym when building arel nodes [CVE-2013-1854]
      Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets
      bumping to rc2
      Revert "Merge pull request #8209 from senny/backport_8176"
      Freeze columns only once per Result
      Preparing for 3.2.13.rc1 release
      Update CHANGELOGs for 3.2.13 release.
    
    Conflicts:
    	actionmailer/CHANGELOG.md
    	actionpack/CHANGELOG.md
    	activemodel/CHANGELOG.md
    	activeresource/CHANGELOG.md
    	activesupport/CHANGELOG.md
    	railties/CHANGELOG.md
Commits on Mar 14, 2013
  1. @jbarreneche
Commits on Mar 12, 2013
  1. @carlosantoniodasilva

    Merge pull request #9616 from exviva/multiple_select_name_double_squa…

    carlosantoniodasilva authored
    …re_brackets
    
    Fix incorrectly appended square brackets to a multiple select box
    
    Before:
    
        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][][]" ...>
    
    After:
    
        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][]" ...>
    
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_view/helpers/tags/base.rb
    	actionpack/test/template/form_options_helper_test.rb
Commits on Mar 9, 2013
  1. @carlosantoniodasilva

    Merge pull request #9616 from exviva/multiple_select_name_double_squa…

    carlosantoniodasilva authored
    …re_brackets
    
    Fix incorrectly appended square brackets to a multiple select box
    
    Before:
    
        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][][]" ...>
    
    After:
    
        select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
        # => <select name="post[category][]" ...>
    
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_view/helpers/tags/base.rb
    	actionpack/test/template/form_options_helper_test.rb
Something went wrong with that request. Please try again.