aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Regression test for rendering file from absolute patheileencodes2016-01-281-0/+11
* Lock test-unit to 3.0.x releasesAndrew White2016-01-261-1/+1
* Use 1.8 compatible hash syntaxAndrew White2016-01-251-4/+4
* Merge pull request #23250 from simi/3-2-stable-1-8Aaron Patterson2016-01-252-5/+5
|\
| * Use Ruby 1.8 compat syntax in test of security fix in activerecord/test/cases...Josef Šimánek2016-01-261-4/+4
| * Use Ruby 1.8 compat syntax in actionpack/lib/action_view/template/resolver.rb.Josef Šimánek2016-01-261-1/+1
|/
* Merge branch '3-2-sec' into 3-2-stableAaron Patterson2016-01-2518-18/+152
|\
| * bumping versionAaron Patterson2016-01-259-9/+9
| * allow :file to be outside rails root, but anything else must be inside the ra...Aaron Patterson2016-01-224-4/+69
| * Don't short-circuit reject_if procAndrew White2016-01-222-2/+25
| * stop caching mime types globallyAaron Patterson2016-01-221-2/+16
| * use secure string comparisons for basic auth username / passwordAaron Patterson2016-01-222-1/+33
* | update bundler messageArthur Neves2016-01-151-3/+2
* | rack-cache 1.3+ dont work with old ruby versionsArthur Neves2016-01-151-0/+4
* | Fix mysql2 buildArthur Neves2016-01-151-1/+1
* | fix build, forcing i18n to verion 0.6.xArthur Neves2016-01-141-3/+1
* | Merge pull request #20629 from moklett/patch-1Rafael Mendonça França2015-06-181-1/+1
|\ \
| * | Fix typo in version numberMichael Klett2015-06-181-1/+1
|/ /
* | Merge branch '3-2-sec' into 3-2-stableRafael Mendonça França2015-06-1620-22/+63
|\|
| * Removing inaccurate note on the releasing guideRafael Mendonça França2015-06-161-3/+0
| * Preparing for 3.2.22 releaseRafael Mendonça França2015-06-1616-9/+48
| * enforce a depth limit on XML documentsAaron Patterson2015-06-163-10/+15
|/
* Merge pull request #18718 from jgeiger/fix_ruby_2_2_comparable_warningsRafael Mendonça França2015-01-292-1/+2
|\
| * Fix ruby 2.2 comparable warningsJoey Geiger2015-01-292-1/+2
|/
* pg 0.18 not support Ruby < 1.9.3Rafael Mendonça França2015-01-071-1/+5
* Only use old i18n when version is not compatibleRafael Mendonça França2015-01-071-2/+4
* Remove hard dependency on test-unitRafael Mendonça França2015-01-075-4/+17
* Merge pull request #18306 from tmm1/rm-3-2-with-ruby-2-1-plusRafael Mendonça França2015-01-0713-13/+39
|\
| * add parens to fix warningAman Gupta2015-01-051-1/+1
| * fix whitespace to match surrounding codeAman Gupta2015-01-021-1/+1
| * use self.method syntax to resolve circular argument issuesAman Gupta2015-01-022-5/+5
| * Fix `singleton_class?`Vipul A M2015-01-021-3/+5
| * parse stringified mime typeAman Gupta2015-01-021-1/+1
| * fix yaml compat on ruby 2.2Aman Gupta2015-01-021-1/+3
| * fix regex caseAman Gupta2015-01-021-1/+1
| * restore I18n.locale after testAman Gupta2015-01-021-0/+8
| * convert another incompatible assert_raise invocationAman Gupta2015-01-021-1/+2
| * switch to minitest and test-unit compatible assert_raise syntaxKouhei Sutou2015-01-021-1/+2
| * blacklist test-unit's @internal_data ivarAman Gupta2015-01-021-0/+1
| * try using newer test-unit gemAman Gupta2015-01-021-1/+1
| * added dependency of test-unit into activesupportSHIBATA Hiroshi2015-01-021-0/+1
| * Lock i18n to a version that works with Ruby 1.8Rafael Mendonça França2015-01-021-0/+2
| * Merge pull request #18160 from tmm1/3-2-ruby-2-2Rafael Mendonça França2015-01-023-6/+12
| |\
| | * Check `respond_to` before delegation due to: https://github.com/ruby/ruby/com...Aaron Patterson2014-12-221-1/+7
| | * fix ruby 2.2 warning: circular argument referenceAman Gupta2014-12-222-5/+5
| |/ |/|
| * Test Rails 3.2 with Ruby 2.1 and 2.2Rafael Mendonça França2015-01-011-0/+2
|/
* bumping version for relesaseAaron Patterson2014-11-169-9/+9
* correctly escape backslashes in request path globsAaron Patterson2014-11-162-2/+44
* Merge branch '3.2.20' into 3-2-stableAaron Patterson2014-10-3011-10/+47
|\
| * bumping version to 3.2.20Aaron Patterson2014-10-299-9/+9