aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * bumping versionAaron Patterson2016-08-119-9/+9
| * Include missing module in tag_helperCarlos Antonio da Silva2016-08-111-0/+1
* | Merge branch '3-2-22-3' into 3-2-stableAaron Patterson2016-08-1111-13/+30
|\|
| * bumping versionAaron Patterson2016-08-109-9/+9
| * ensure tag/content_tag escapes " in attribute valsAndrew Carpenter2016-08-102-4/+21
* | Merge pull request #25043 from tlrdstd/support_ruby_2_3Rafael França2016-05-204-3/+9
|\ \
| * | Associations do not call `.to_proc` on HashTyler Distad2016-05-164-3/+9
|/ /
* | update rendering commentArthur Neves2016-03-141-1/+1
* | Require hash_with_indifferent_access before using itRafael Mendonça França2016-03-081-0/+2
* | fix 1.8 hash syntaxArthur Neves2016-03-011-1/+1
* | Add missing require to fileArthur Neves2016-03-011-0/+1
|/
* Preparing for 3.2.22.2 releaseRafael Mendonça França2016-02-299-9/+9
* Add bundle check to release taskRafael Mendonça França2016-02-291-1/+5
* Don't allow render(params) in view/controllerArthur Neves2016-02-293-6/+79
* Complete work on 3.2 for render_data_leak patch.Arthur Neves2016-02-299-103/+79
* Generated engines should protect from forgeryAaron Patterson2016-02-011-0/+1
* Run `file.close` before unlinking for traviseileencodes2016-01-281-1/+2
* Fix hash syntax for 1.8.7eileencodes2016-01-281-1/+1
* 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