aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* 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 branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-295-93/+109
|\
| * Don't rescue IPAddr::InvalidAddressErrorPeter Suschlik2014-08-291-1/+1
| * Merge pull request #16637 from Agis-/redirect-with-constraint-routeAaron Patterson2014-08-281-2/+0
| |\
| | * Don't ignore constraints in redirect routesAgis-2014-08-251-2/+0
| * | Refactor out Dir.glob from ActionDispatch::Staticschneems2014-08-271-20/+5
| * | Address comments on Gzip implementationschneems2014-08-241-10/+19
| |/
| * Refactor ActionDispatch::RemoteIpSam Aarons2014-08-211-52/+38
| * Avoid duplicating routes for HEAD requests.Guo Xiang Tan2014-08-212-17/+29
| * Enable gzip compression by defaultschneems2014-08-201-14/+40
* | 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-191-3/+65
|\
| * Auth token mask from breach-mitigation-rails gemBradley Buda2014-08-191-3/+65
* | Protect against error when parsing parameters with Bad RequestRafael Mendonça França2014-08-191-2/+2
* | Merge pull request #16299 from sikachu/ps-safer-ac-paramsJeremy Kemper2014-08-191-3/+84
|\ \
| * | User `#to_hash` instead of calling `super`Prem Sichanugrist2014-08-181-1/+1
| * | Fix failing test on several methods on ParameterPrem Sichanugrist2014-08-181-1/+25
| * | Refactor code to reduce duplicate `self.class.new`Prem Sichanugrist2014-08-181-12/+10
| * | Add missing `Hash` methods to `AC::Parameters`Prem Sichanugrist2014-08-181-0/+40
| * | Make `AC::Params#to_h` return Hash with safe keysPrem Sichanugrist2014-08-181-0/+19
* | | 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-181-0/+1
* | | 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-176-597/+27
|\ \ \ \
| * \ \ \ Merge branch 'master' into loofahRafael Mendonça França2014-08-1713-607/+218
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into loofahRafael Mendonça França2014-08-1236-402/+512
| |\ \ \ \ \
| * | | | | | We don't need loofah for the assertionsRafael Mendonça França2014-07-152-4/+2
| * | | | | | Merge pull request #11218 from kaspth/loofah-integrationRafael Mendonça França2014-07-106-597/+29
| |\ \ \ \ \ \
| | * | | | | | Add document_root_element to ActionDispatch::IntegrationTest so assert_select...Timm2014-06-161-0/+4
| | * | | | | | Moved html_document to ActionDispatch::Assertions. Included the Rails::Dom::T...Timm2014-06-162-7/+13
| | * | | | | | Support for changes in SelectorAssertions.Timm2014-06-161-0/+14
| | * | | | | | Changed deprecation message in dom and selector assertions in Action Dispatch.Timm2014-06-162-2/+2
| | * | | | | | Removed tag.rb, since it is actually removed, not just deprecated. [ci skip]Timm2014-06-161-3/+0
| | * | | | | | Moved ActionView::Assertions dependency from Action Pack's lib to abstract_un...Timm2014-06-162-4/+1
| | * | | | | | Added deprecation warning to ActionDispatch::Assertions::TagAssertions.Timm2014-06-161-0/+3
| | * | | | | | Trimmed deprecation message for ActionDispatch::Assertions::SelectorAssertions.Timm2014-06-161-1/+1
| | * | | | | | Require ActionView::Assertions in ActionController test_case.rb.Timm2014-06-161-0/+1
| | * | | | | | Moved Dom and Selector assertions from ActionDispatch to ActionView.Timm2014-06-165-544/+7
| | * | | | | | Fixed: assert_select_encoded finds the right content. No longer uses a <encod...Timm2014-06-161-5/+9
| | * | | | | | Removed mention of css_select supporting substitution values. It is not teste...Timm2014-06-161-7/+1
| | * | | | | | Updated documentation to state more things about css selectors with substitut...Timm2014-06-161-3/+11
| | * | | | | | Reworked the wrapping root in NodeSet implementation in css_select.Timm2014-06-161-3/+5
| | * | | | | | Wrapped element to search in NodeSet. Changed selectors to selector.Timm2014-06-161-3/+5