Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | only wrap the strategy with exception handling | Aaron Patterson | 2015-09-18 | 1 | -9/+10 |
| | | | | | | we need to be more specific about exception handling when dealing with the parse strategies. The calls to `return yield` can also raise an exception, but we don't want to handle that in *this* code. | ||||
* | pull `normalize_encode_params` up | Aaron Patterson | 2015-09-18 | 2 | -4/+3 |
| | | | | | `normalize_encode_params` is common to all parser code paths, so we can pull that up and always apply it before assigning the request parameters | ||||
* | remove the `default` parameter from the parser method | Aaron Patterson | 2015-09-18 | 1 | -8/+5 |
| | | | | | since there is only one "default" strategy now, we can just use the block parameter for that. | ||||
* | move parameter parsing to the request object | Aaron Patterson | 2015-09-18 | 2 | -22/+37 |
| | | | | | All parameter parsing should be on the request object because the request object is the object that we ask for parameters. | ||||
* | Merge pull request #21666 from ronakjangir47/enum_refactoring | Godfrey Chan | 2015-09-18 | 1 | -21/+13 |
|\ | | | | | DRY enum conflict detection | ||||
| * | DRY enum conflict detection | Ronak Jangir | 2015-09-18 | 1 | -21/+13 |
| | | |||||
* | | Merge pull request #21662 from amitsuroliya/improve_docs | Kasper Timm Hansen | 2015-09-18 | 1 | -3/+3 |
|\ \ | | | | | | | Corrected `to_time` output in ActiveSupport Date Conversion docs [ci … | ||||
| * | | Corrected `to_time` output in ActiveSupport Date Conversion docs.Since ↵ | amitkumarsuroliya | 2015-09-18 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/48583f8bf74d1cefefea3cd6591bd546a9eaff6c, to_time returns times formatted as YYYY-MM-DD HH:MM:SS UTC [ci skip] `to_time` method now returns in `YYYY-MM-DD HH:MM:SS UTC` format. | ||||
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-09-18 | 4 | -8/+8 |
|\ \ \ | | |/ | |/| | |||||
| * | | s/JQuery/jQuery/ | Akira Matsuda | 2015-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | [ci skip] Fix module name of document | yui-knk | 2015-09-17 | 1 | -1/+1 |
| | | | |||||
| * | | [ci skip] Replace double spaces with single space | yui-knk | 2015-09-17 | 1 | -1/+1 |
| | | | |||||
| * | | Add missing and remove unnecessary periods in testing.md [ci skip] | Juanito Fatas | 2015-09-05 | 1 | -5/+5 |
| | | | |||||
* | | | File encoding is defaulted to utf-8 in Ruby >= 2.1 | Akira Matsuda | 2015-09-18 | 19 | -29/+0 |
| | | | |||||
* | | | D HH => D H H | Akira Matsuda | 2015-09-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #21660 from amitsuroliya/improve_docs | Arthur Nogueira Neves | 2015-09-17 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | Correct ArgumentError message in ActiveSupport conversions docs [ci s… | ||||
| * | | Correct ArgumentError message in ActiveSupport conversions docs [ci skip] | amitkumarsuroliya | 2015-09-18 | 1 | -1/+1 |
|/ / | | | | | This was happened after this commit https://github.com/rails/rails/commit/2ebf47aea21ff8ac10681e53e78dd7a0e5c31c6e | ||||
* | | Merge pull request #21658 from defektive/patch-1 | Rafael Mendonça França | 2015-09-17 | 1 | -1/+1 |
|\ \ | | | | | | | Change AbstractRequest to ActionDispatch::Request | ||||
| * | | Change AbstractRequest to ActionDispatch::Request | Bradley D | 2015-09-17 | 1 | -1/+1 |
|/ / | | | | | | | | | | | AbstractRequest has been deprecated, updating to refer to ActionDispatch::Request instead. [ci skip] | ||||
* | | Merge pull request #21562 from betesh/mime_types_in_actionmailer | Andrew White | 2015-09-17 | 1 | -0/+7 |
|\ \ | | | | | | | When used by ActionMailer, ActionView should automatically use the correct MIME type just as it does when used by ActionDispatch | ||||
| * | | When used by ActionMailer, ActionView should automatically use the correct ↵ | Isaac Betesh | 2015-09-09 | 1 | -0/+7 |
| | | | | | | | | | | | | MIME type just as it does when used by ActionDispatch #11157 | ||||
* | | | Merge pull request #21625 from amitsuroliya/improve_docs | Andrew White | 2015-09-17 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Improve Docs of ActiveSupport::TimeZone [ci skip] | ||||
| * | | | Improve Docs of ActiveSupport::TimeZone [ci skip] | amitkumarsuroliya | 2015-09-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | `TimeZone` class is a part of `ActiveSupport` module. For Accessing `TimeZone` class, we need to call `ActiveSupport::TimeZone` instead of `TimeZone`. individual `TimeZone` gives `NameError: uninitialized constant ‘TimeZone’ error | ||||
* | | | | Merge pull request #20889 from morgoth/fix-mailer-previews-on-not-local-requests | Andrew White | 2015-09-17 | 3 | -2/+11 |
|\ \ \ \ | | | | | | | | | | | Fix displaying mailer previews on non local requests. | ||||
| * | | | | Fix displaying mailer previews on non local requests. | Wojciech Wnętrzak | 2015-09-17 | 3 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When config `action_mailer.show_previews` is set, previews are displayed regardless of local request check. | ||||
* | | | | | Merge pull request #21654 from yui-knk/fix/doc_api | Arthur Nogueira Neves | 2015-09-17 | 1 | -7/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Remove useless "@api public/private" | ||||
| * | | | | | [ci skip] Remove useless "@api public/private" | yui-knk | 2015-09-17 | 1 | -7/+1 |
| |/ / / / | | | | | | | | | | | | | | | | Other public APIs do not have these annotations. | ||||
* | | | | | Merge pull request #21651 from shingo-nakanishi/fixed_docs | Yves Senn | 2015-09-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed helpers submit button Examples [ci skip] | ||||
| * | | | | | No need the `a` | shingo.nakanishi | 2015-09-17 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fixed helpers submit button Examples [ci skip] | shingo.nakanishi | 2015-09-17 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #21581 from ronakjangir47/restrict_with_error | Yves Senn | 2015-09-17 | 5 | -2/+44 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | `restrict_with_error` message will now respect owner’s human name | ||||
| * | | | | `restrict_with_error` message will now respect owner’s human name in any ↵ | Ronak Jangir | 2015-09-12 | 4 | -2/+39 |
| | | | | | | | | | | | | | | | | | | | | locale [kuboon & Ronak Jangir] | ||||
* | | | | | Merge pull request #21637 from amitsuroliya/doc_fixes | Kasper Timm Hansen | 2015-09-17 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Improved ActiveRecord Connection Pool docs [ci skip] | ||||
| * | | | | | Improved ActiveRecord Connection Pool docs [ci skip] | amitkumarsuroliya | 2015-09-17 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #21566 from ronakjangir47/active_record2 | Kasper Timm Hansen | 2015-09-16 | 8 | -58/+85 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Removed mocha from Active Record Part 2 | ||||
| * | | | | | | Removed mocha from Active Record Part 2 | Ronak Jangir | 2015-09-16 | 8 | -58/+85 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | s/Github/GitHub/ | Akira Matsuda | 2015-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | Merge pull request #21646 from ↵ | Richard Schneeman | 2015-09-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/no-hardcoded-ignored-lines-in-schema-dumper Don't hardcode table name | ||||
| * | | | | | | Don't hardcode table name | schneems | 2015-09-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The schema_migrations table name is configurable. We should use this value when checking for ignored table names when dumping schema instead of a hardcoded value. | ||||
* | | | | | | | Clarify CSRF <script> purpose and protection. Note how to deal with your own ↵ | Jeremy Daer | 2015-09-16 | 2 | -6/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <script> tags. Ref #21618 [ci skip] | ||||
* | | | | | | | Merge pull request #21644 from AvnerCohen/i18n_backend | Claudio B. | 2015-09-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update documentation to remove 'desirable' suggestion for what is not a clear cut approach | ||||
| * | | | | | | | Update documentation to remove 'desirable' suggestion for what is not a ↵ | Avner Cohen | 2015-09-16 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | clear cut approach | ||||
* | | | | | | | Merge pull request #21618 from designgrill/master | Eileen M. Uchitelle | 2015-09-16 | 2 | -5/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Improved explanation of the <script> tag CSRF behavior | ||||
| * | | | | | | Improved explanation of the <script> tag CSRF behavior | Anshul Agrawal | 2015-09-14 | 2 | -5/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #21640 from yahonda/doc_remove_default_null | Arthur Nogueira Neves | 2015-09-15 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [ci skip] Remove `DEFAULT NULL` from examples | ||||
| * | | | | | | | [ci skip] Remove `DEFAULT NULL` from examples | Yasuo Honda | 2015-09-16 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #21634 from ↵ | Kasper Timm Hansen | 2015-09-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JuanitoFatas/feature/fewer-rack-env-direct-manipulate Use rack.session_options instead of directly change env | ||||
| * | | | | | | | Use rack.session_options instead of directly change env | Juanito Fatas | 2015-09-16 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #21623 from schneems/schneems/schema-migration-docs | Richard Schneeman | 2015-09-15 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Doc SchemaMigration class. | ||||
| * | | | | | | | Doc SchemaMigration class. | schneems | 2015-09-14 | 1 | -1/+5 |
| | |_|_|/ / / | |/| | | | | |