aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Ship with rails-html-sanitizer instead.Kasper Timm Hansen2014-09-031-1/+1
* Leave all our tests as order_dependent! for nowMatthew Draper2014-09-021-0/+5
* Allow polymorphic routes with nil when a route can still be drawnSammy Larbi2014-08-311-1/+2
* Refer to the library name instead of the constantRobin Dupret2014-08-301-1/+1
* Merge pull request #16644 from Agis-/drb-tests-actionpack-vagrantXavier Noria2014-08-301-3/+1
|\
| * Use system /tmp when testing actionpackAgis-2014-08-221-3/+1
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-2924-112/+288
|\ \
| * | Don't rescue IPAddr::InvalidAddressErrorPeter Suschlik2014-08-292-1/+8
| * | Merge pull request #16637 from Agis-/redirect-with-constraint-routeAaron Patterson2014-08-283-2/+31
| |\ \
| | * | Don't ignore constraints in redirect routesAgis-2014-08-253-2/+31
| | |/
| * | Test everythingAkira Matsuda2014-08-281-1/+1
| * | AP test files does no more need to be alphabetically sorted hereAkira Matsuda2014-08-281-4/+1
| * | Refactor out Dir.glob from ActionDispatch::Staticschneems2014-08-276-20/+13
| * | Merge pull request #16717 from splattael/keygeneratorSantiago Pastorino2014-08-271-1/+1
| |\ \
| | * | Use less iterations for KeyGenerator in testsPeter Suschlik2014-08-271-1/+1
| * | | minor changelog formatting changes.Yves Senn2014-08-271-4/+5
| |/ /
| * / Address comments on Gzip implementationschneems2014-08-246-12/+51
| |/
| * Refactor ActionDispatch::RemoteIpSam Aarons2014-08-212-52/+46
| * Improve router test.Guo Xiang Tan2014-08-211-6/+11
| * Avoid duplicating routes for HEAD requests.Guo Xiang Tan2014-08-215-18/+69
| * Enable gzip compression by defaultschneems2014-08-207-16/+76
* | Preparing for 4.2.0.beta1 releaseDavid Heinemeier Hansson2014-08-191-1/+1
|/
* Merge pull request #16570 from bradleybuda/breach-mitigation-mask-csrf-tokenJeremy Kemper2014-08-192-8/+71
|\
| * Auth token mask from breach-mitigation-rails gemBradley Buda2014-08-192-8/+71
* | Use released rails-deprecated_sanitizerRafael Mendonça França2014-08-191-1/+1
* | Fix the rails-dom-testing dependecyRafael Mendonça França2014-08-191-0/+1
* | Protect against error when parsing parameters with Bad RequestRafael Mendonça França2014-08-192-2/+27
* | Merge pull request #16299 from sikachu/ps-safer-ac-paramsJeremy Kemper2014-08-195-39/+382
|\ \
| * | User `#to_hash` instead of calling `super`Prem Sichanugrist2014-08-181-1/+1
| * | Fix failing test on several methods on ParameterPrem Sichanugrist2014-08-183-3/+36
| * | Seperate Parameters accessors and mutators testsPrem Sichanugrist2014-08-183-57/+215
| * | Refactor code to reduce duplicate `self.class.new`Prem Sichanugrist2014-08-181-12/+10
| * | Add missing `Hash` methods to `AC::Parameters`Prem Sichanugrist2014-08-182-0/+61
| * | Make `AC::Params#to_h` return Hash with safe keysPrem Sichanugrist2014-08-183-0/+93
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-193-2/+31
|\ \ \
| * | | Uppercase HTML in docs.Hendy Tanata2014-08-083-10/+10
| * | | [ci skip] Document ActionDispatch::Staticschneems2014-08-051-0/+9
| * | | [ci skip] document ActionDispatch::FileHandlerschneems2014-08-051-0/+10
| * | | [ci skip] Document PublicExceptions middlewareschneems2014-08-051-0/+10
* | | | Add missing requireGodfrey Chan2014-08-181-0/+2
| |/ / |/| |
* | | Deprecate TagAssertion instead of removingRafael Mendonça França2014-08-182-1/+2
* | | Bump rack dependencySantiago Pastorino2014-08-181-1/+1
* | | Expectations firstAkira Matsuda2014-08-187-34/+34
* | | Merge pull request #15889 from carnesmedia/model-nameRafael Mendonça França2014-08-172-6/+6
|\ \ \
| * | | Use #model_name on instances instead of classesAmiel Martin2014-06-242-6/+6
* | | | Merge branch 'loofah'Rafael Mendonça França2014-08-1714-1772/+37
|\ \ \ \
| * \ \ \ Merge branch 'master' into loofahRafael Mendonça França2014-08-1731-1381/+464
| |\ \ \ \
| * | | | | Prepare for partial release.Kasper Timm Hansen2014-08-172-5/+2
| * | | | | Merge branch 'master' into loofahRafael Mendonça França2014-08-12122-799/+1184
| |\ \ \ \ \
| * | | | | | Remove more unneeded includeRafael Mendonça França2014-07-151-3/+0