aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix AC::Parameters not being sanitized for query methods.Guo Xiang Tan2015-10-024-7/+64
* Merge pull request #21838 from jeremy/response-add-headerJeremy Daer2015-10-012-0/+79
|\
| * Response#add_header for adding to multi-valued headers like VaryJeremy Daer2015-10-012-0/+79
|/
* Merge pull request #21836 from jeremy/no-nil-set-cookie-headersJeremy Daer2015-10-012-75/+96
|\
| * Don't set a nil Set-Cookie header when there aren't any cookies. Omit the hea...Jeremy Daer2015-10-012-75/+96
|/
* Merge pull request #21757 from Gaurav2728/gaurav-adding_x_frame_testKasper Timm Hansen2015-10-011-1/+11
|\
| * adding test for content type with default charsetGaurav Sharma2015-10-021-1/+11
|/
* Merge pull request #20599 from aliaksandrb/regex_fix_for_mattr_accessorArthur Nogueira Neves2015-10-012-2/+16
|\
| * Regex fix for mattr_accessor validationAliaksandr Buhayeu2015-10-012-2/+16
|/
* Merge pull request #21760 from repinel/refactor-as-callbacks-halt-configKasper Timm Hansen2015-10-019-36/+38
|\
| * Refactor AS::Callbacks halt config and fix the documentationRoque Pinel2015-10-019-36/+38
|/
* Merge pull request #21823 from prakashlaxkar/test_casesKasper Timm Hansen2015-10-011-0/+12
|\
| * Add test cases for checkbox_tagPrakash Laxkar2015-10-011-0/+12
|/
* make sure exceptions are marshalable when returning test resultsAaron Patterson2015-09-301-1/+17
* Merge pull request #21821 from akshay-vishnoi/fix-test-casesKasper Timm Hansen2015-09-301-1/+7
|\
| * Add test case for text_field_tagAkshay Vishnoi2015-10-011-1/+7
|/
* only construct one request in an engineAaron Patterson2015-09-302-14/+17
* run against edge sass to eliminate circular require warningsAaron Patterson2015-09-303-7/+11
* Merge pull request #20574 from repinel/fix-db-fixtures-loadYves Senn2015-09-308-14/+130
|\
| * Allow fixtures YAML files to set the model class in the file itselfRoque Pinel2015-09-119-12/+130
* | Merge pull request #21817 from jdantonio/clear-concurrent-ruby-warningsKasper Timm Hansen2015-09-303-6/+6
|\ \
| * | Fixed concurrent-ruby warnings.Jerry D'Antonio2015-09-293-6/+6
|/ /
* | Bump concurrent-ruby to shush circular require warningJeremy Daer2015-09-291-1/+1
* | call `default_middleware_stack` before merging stacksAaron Patterson2015-09-291-1/+2
* | Engines get different middleware than appsAaron Patterson2015-09-293-4/+29
* | Merge pull request #21794 from jeremy/sprockets/move-asset-manifest-from-topl...Jeremy Daer2015-09-2911-191/+262
|\ \
| * | Eliminate overlapping `app/assets` load pathJeremy Daer2015-09-2911-191/+262
* | | Make app building threadsafeeileencodes2015-09-291-4/+8
* | | Stop modifying global variableseileencodes2015-09-293-8/+4
* | | Merge pull request #21813 from prakashlaxkar/doc_changesRafael Mendonça França2015-09-296-6/+6
|\ \ \
| * | | Improve readability of docs by using code tag [ci skip]Prakash Laxkar2015-09-296-6/+6
* | | | Merge pull request #21816 from nburkley/has-many-documentationArthur Nogueira Neves2015-09-291-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix documentation for has_many dependant options.Niall Burkley2015-09-291-1/+4
|/ / /
* | | Merge pull request #21430 from kaspth/test-runner-fail-fastKasper Timm Hansen2015-09-295-6/+197
|\ \ \
| * | | Add fail fast to test runner.Kasper Timm Hansen2015-09-295-0/+84
| * | | Add inline failure reporting to test runner.Kasper Timm Hansen2015-09-285-6/+113
* | | | Merge pull request #21661 from akshay-vishnoi/submit_tag_testsRafael Mendonça França2015-09-292-1/+9
|\ \ \ \
| * | | | Fix - Prevent adding of `data-disable-with` option twice in html.Akshay Vishnoi2015-09-182-1/+9
* | | | | Merge pull request #21811 from akihiro17/remove-unused-test-codeRafael Mendonça França2015-09-291-11/+0
|\ \ \ \ \
| * | | | | Remove TestRouter#add_routesakihiro172015-09-291-11/+0
|/ / / / /
* | | | | Merge pull request #21810 from akshay-vishnoi/form-tag-testsRafael Mendonça França2015-09-291-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix names of test casesAkshay Vishnoi2015-09-291-3/+3
|/ / / /
* | | | Merge pull request #21807 from ronakjangir47/fix_formatted_offset_docsRafael Mendonça França2015-09-293-3/+10
|\ \ \ \
| * | | | Update docs for `formatted_offset` Ronak Jangir2015-09-293-3/+10
* | | | | remove useless methodAaron Patterson2015-09-281-4/+0
* | | | | Separate `dup` from `deep_dup` in the attributes hashSean Griffin2015-09-285-6/+36
* | | | | Inline `Attribute#original_value`Sean Griffin2015-09-281-5/+1
* | | | | Merge pull request #21800 from Gaurav2728/no_more_class_methods_for_JoinDepen...Rafael Mendonça França2015-09-281-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | no more class methods for JoinDependency [ci skip]Gaurav Sharma2015-09-291-2/+1
* | | | | Merge pull request #21782 from ronakjangir47/transform_values_docsRafael Mendonça França2015-09-282-8/+17
|\ \ \ \ \