aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21853 from amitsuroliya/deprecated_string_middlewareKasper Timm Hansen2015-10-031-1/+1
|\
| * Fixed deprecated string to specify the middleware [ci skip]amitkumarsuroliya2015-10-031-1/+1
|/
* Merge pull request #21852 from morgoth/support-array-in-assert_enqueued_jobs-...Kasper Timm Hansen2015-10-033-1/+23
|\
| * Support passing array to `assert_enqueued_jobs` in `:only` optionWojciech Wnętrzak2015-10-033-1/+23
|/
* Merge pull request #21851 from y-yagi/use_class_to_specify_middlewareKasper Timm Hansen2015-10-032-6/+6
|\
| * use class to specify the middleware [ci skip]yuuji.yaginuma2015-10-032-6/+6
* | removing Rack::Runtime from the default stack.Aaron Patterson2015-10-027-16/+14
* | Merge pull request #21842 from morgoth/mark-private-methods-as-nodocRafael Mendonça França2015-10-021-5/+5
|\ \
| * | Do not document private methods in AJ::TestHelperWojciech Wnętrzak2015-10-021-5/+5
|/ /
* | Merge pull request #21809 from yui-knk/fix_doc_am_serializationSean Griffin2015-10-021-3/+3
|\ \
| * | [ci skip] Fix explanation of `ActiveModel::Serialization`yui-knk2015-10-021-3/+3
* | | Merge pull request #21839 from andyatkinson/remove-unusued-scopesSean Griffin2015-10-023-10/+0
|\ \ \
| * | | Remove unused scopesAndy Atkinson2015-10-013-10/+0
* | | | Build the `AttributeMutationTracker` lazilySean Griffin2015-10-022-14/+16
* | | | Merge pull request #20600 from mtsmfm/xmlschema-should-display-more-than-6-di...Andrew White2015-10-022-7/+6
|\ \ \ \
| * | | | TimeWithZone#xmlschema should be able to display more than 6 digitsFumiaki MATSUSHIMA2015-09-302-7/+6
* | | | | Merge pull request #21539 from tgxworld/parameters_not_sanitizedSean Griffin2015-10-024-7/+64
|\ \ \ \ \
| * | | | | Fix AC::Parameters not being sanitized for query methods.Guo Xiang Tan2015-10-024-7/+64
| | |_|_|/ | |/| | |
* | | | | 💣Sean Griffin2015-10-021-1/+1
* | | | | Fix test failures on MySQLSean Griffin2015-10-023-3/+7
* | | | | Further encapsulate dirty checking on `Attribute`Sean Griffin2015-10-026-51/+99
|/ / / /
* | | | 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
|\ \ \