aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25650 from ↵Rafael França2016-07-171-0/+3
|\ | | | | | | | | prathamesh-sonpatki/add-note-about-changelog-at-the-top Add a note about adding CHANGELOG entries at the top of the file
| * Add a note about adding CHANGELOG entries at the top of the file [ci skip]Prathamesh Sonpatki2016-07-021-0/+3
| |
* | Merge pull request #25864 from vipulnsward/fix-ap-testRafael França2016-07-171-0/+2
|\ \ | | | | | | Fix failing requirement of duplicable in ParameterFilter
| * | Fix failing requirement of duplicable in ParameterFilterVipul A M2016-07-161-0/+2
| | |
* | | Merge pull request #25850 from ojab/layout_doc_fixRafael Mendonça França2016-07-171-1/+4
|\ \ \ | |/ / |/| | | | | Mention that layout can call a Proc [ci skip]
| * | Mention that layout can call a Proc [ci skip]ojab2016-07-151-1/+4
| | | | | | | | | | | | Also document return values for Proc/Symbol arguments
* | | Merge pull request #25861 from vipulnsward/fix-grammerRafael França2016-07-171-2/+2
|\ \ \ | | | | | | | | Fix CHANGELOG grammar [ci skip]
| * | | Fix CHANGELOG grammar [ci skip]Vipul A M2016-07-161-2/+2
|/ / /
* | | Merge pull request #25860 from prathamesh-sonpatki/add-cg-for-rails-initializersRafael França2016-07-173-3/+16
|\ \ \ | | | | | | | | CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]
| * | | CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]Prathamesh Sonpatki2016-07-173-3/+16
|/ / / | | | | | | | | | - Also minor weekly CHANGELOG cleanup.
* | | Merge pull request #25815 from greysteil/add-newline-between-structure-versionsRafael França2016-07-162-2/+9
|\ \ \ | | | | | | | | Add newline between each migration in `structure.sql`
| * | | Add newline between each migration in `structure.sql`Grey Baker2016-07-142-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Keeps schema migration inserts as a single commit, so we still get all of the benefits of https://github.com/rails/rails/commit/42dd2336b31a8d98776d039a2b9fd7f834156a78, but allows for easier git diff-ing. Fixes #25504.
* | | | Merge pull request #25775 from ↵Eileen M. Uchitelle2016-07-161-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | junaruga/hotfix/actionpack-depending-on-activerecord Remove unused activerecord requirement in actionpack.
| * | | | Remove unused activerecord requirement in actionpack.Jun Aruga2016-07-111-1/+0
| | | | |
* | | | | Merge pull request #25854 from prathamesh-sonpatki/fix-test-nameEileen M. Uchitelle2016-07-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix wrong test name
| * | | | | Fix wrong test namePrathamesh Sonpatki2016-07-161-1/+1
|/ / / / / | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/23179
* | | | | Merge pull request #25853 from CodingItWrong/remove-reference-indexes-in-docsVipul A M2016-07-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update references generation docs to exclude index
| * | | | | Update references generation docs to exclude indexJosh Justice2016-07-161-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | In #23179 the migration generator was changed to no longer output `index: true` for `references` migrations. This updates the migrations guide to remove `index: true` from relevant examples. [ci skip]
* | | | | Merge pull request #25851 from y-yagi/add_missing_bracesVipul A M2016-07-151-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | add missing braces [ci skip]
| * | | | add missing braces [ci skip]yuuji.yaginuma2016-07-161-2/+2
| | | | | | | | | | | | | | | | | | | | Also modify to use Ruby 1.9+ syntax.
* | | | | Merge pull request #25826 from javan/actionview/trim-digestor-template-lookupsRafael França2016-07-151-2/+1
|\ \ \ \ \ | |/ / / / |/| | | | Eliminate extra template lookup in ActionView::Digestor
| * | | | Eliminate extra template lookup in ActionView::DigestorJavan Makhmali2016-07-141-2/+1
| | | | |
* | | | | Merge pull request #25845 from znz/fix-broken-linkArun Agrawal2016-07-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix broken link [ci skip]
| * | | | | Fix broken linkKazuhiro NISHIYAMA2016-07-151-1/+1
|/ / / / /
* | | | | Merge pull request #25844 from tyamagu2/empty_typoप्रथमेश Sonpatki2016-07-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] fix a typo
| * | | | | [ci skip] fix a typoYamaguchi.Tomoki2016-07-151-1/+1
|/ / / / /
* | | | | Merge pull request #25831 from rbr/patch-1Vipul A M2016-07-141-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix display of unsorted list in release notes of 5.0 [ci skip]
| * | | | | Fix display of unsorted list in release notes of 5.0 [ci skip]rbr2016-07-141-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #25816 from greysteil/check-path-param-encodingAaron Patterson2016-07-146-29/+35
|\ \ \ \ \ | |/ / / / |/| | | | Check `request.path_parameters` encoding at the point they're set
| * | | | Check `request.path_parameters` encoding at the point they're setGrey Baker2016-07-146-29/+35
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for any non-UTF8 characters in path parameters at the point they're set in `env`. Previously they were checked for when used to get a controller class, but this meant routes that went directly to a Rack app, or skipped controller instantiation for some other reason, had to defend against non-UTF8 characters themselves.
* | | | Merge pull request #25829 from geshafer/fix-typo-in-mailer-previews-testClaudio B2016-07-141-1/+1
|\ \ \ \ | |/ / / |/| | | Fix typo in mailer previews test description [ci skip]
| * | | Fix typo in mailer previews test description [ci skip]Gale Shafer2016-07-141-1/+1
|/ / / | | | | | | | | | | | | A mailer preview test description misspelled the word configuration. This commit updates the test description to spell the word correctly.
* | | fixes a link in the release notes of 5.0 [ci skip]Xavier Noria2016-07-141-1/+1
| | |
* | | small reword [ci skip]Xavier Noria2016-07-141-3/+3
| | |
* | | finders guide: updates the section about batch processing [ci skip]Xavier Noria2016-07-141-15/+38
| | | | | | | | | | | | | | | There are several edits here, but in particular it updates the guide to reflect 451437c.
* | | Merge pull request #25798 from ↵Matthew Draper2016-07-143-3/+21
|\ \ \ | | | | | | | | | | | | | | | | greysteil/dont-raise-unknown-http-method-low-in-stack Don't raise ActionController::UnknownHttpMethod from ActionDispatch::Static
| * | | Don't raise ActionController::UnknownHttpMethod from ActionDispatch::StaticGrey Baker2016-07-133-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ActionDispatch::Static` middleware is used low down in the stack to serve static assets before doing much processing. Since it's called from so low in the stack, we don't have access to the request ID at this point, and generally won't have any exception handling defined (by default `ShowExceptions` is added to the stack quite a bit higher and relies on logging and request ID). Before https://github.com/rails/rails/commit/8f27d6036a2ddc3cb7a7ad98afa2666ec163c2c3 this middleware would ignore unknown HTTP methods, and an exception about these would be raised higher in the stack. After that commit, however, that exception will be raised here. If we want to keep `ActionDispatch::Static` so low in the stack (I think we do) we should suppress the `ActionController::UnknownHttpMethod` exception here, and instead let it be raised higher up the stack, once we've had a chance to define exception handling behaviour. This PR updates `ActionDispatch::Static` so it passes `Rack::Request` objects to `ActionDispatch::FileHandler`, which won't raise an `ActionController::UnknownHttpMethod` error. If an unknown method is passed, it should exception higher in the stack instead, once we've had a chance to define exception handling behaviour.`
* | | | Merge pull request #25817 from ↵Rafael França2016-07-133-11/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | javan/fix-namespaced-implicit-render-etag-template-digest Fix adding implicitly rendered namespaced template digests to ETags
| * | | | Fix adding implicitly rendered namespaced template digests to ETagsJavan Makhmali2016-07-133-11/+46
| | | | |
* | | | | Merge pull request #25771 from kaspth/make-test-response-assign-response-parserKasper Timm Hansen2016-07-134-57/+72
|\ \ \ \ \ | | | | | | | | | | | | Let TestResponse assign a parser.
| * | | | | Let TestResponse assign a parser.Kasper Timm Hansen2016-07-104-57/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we'd only assign a response parser when a request came through Action Dispatch integration tests. This made calls to `parsed_body` when a TestResponse was manually instantiated — though own doing or perhaps from a framework — unintentionally blow up because no parser was set at that time. The response can lookup a parser entirely through its own ivars. Extract request encoder to its own file and assume that a viable content type is present at TestResponse instantiation. Since the default response parser is a no-op, making `parsed_body` equal to `body`, no exceptions will be thrown.
* | | | | | removes a unnecessary limit callXavier Noria2016-07-131-1/+0
| |/ / / / |/| | | | | | | | | | | | | | | | | | | We are setting a limit unconditionally just below, which overrides any existing one anyway.
* | | | | adds support for limits in batch processingXavier Noria2016-07-134-54/+220
| |/ / / |/| | |
* | | | Merge pull request #25799 from greysteil/wrap-rack-params-exceptionsMatthew Draper2016-07-143-2/+14
|\ \ \ \ | | | | | | | | | | Handle `Rack::QueryParser` errors in `ActionDispatch::ExceptionWrapper`
| * | | | Handle `Rack::QueryParser` errors in `ActionDispatch::ExceptionWrapper`Grey Baker2016-07-123-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rack [recently](https://github.com/rack/rack/commit/7e7a3890449b5cf5b86929c79373506e5f1909fb) moved the namespace of its `ParameterTypeError` and `InvalidParameterError` errors. Whilst an alias for the old name was added, the logic in `ActionDispatch::ExceptionWrapper` was still broken by this change, since it relies on the class name. This PR updates `ActionDispatch::ExceptionWrapper` to handle the Rack 2.0 namespaced errors correctly. We no longer need to worry about the old names, since Rails specifies Rack ~> 2.0.
* | | | | Merge pull request #25795 from mechanicles/command-importanceGuillermo Iguaran2016-07-132-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Give importance to rails command [ci skip]
| * | | | | Give importance to rails command in the comment section.Santosh Wadghule2016-07-132-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #25748 from CodingItWrong/generator-field-types-linkVipul A M2016-07-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Correct link for model generator field types
| * | | | | Correct link for model generator field typesJosh Justice2016-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most complete list of field types appears in the `SchemaStatements` docs rather than the `TableDefinition` docs. The change to link to `SchemaStatements` means that the explanation for the `index` parameter is no longer available on the linked-to page. A brief explanation of the `index` parameter is added directly in the guide to make up for this.
* | | | | | Merge pull request #25790 from mrageh/wrap-lazy-load-hooks-in-moduleRafael França2016-07-131-18/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Wrap module around lazy load hooks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 04:49:13 +0000