Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #31004 from shuheiktgw/remove_unnecessary_returns | Rafael França | 2017-10-31 | 12 | -16/+16 |
|\ | | | | | Remove redundant return statements | ||||
| * | removed unnecessary returns | Shuhei Kitagawa | 2017-10-28 | 12 | -16/+16 |
| | | |||||
* | | Merge pull request #31012 from y-yagi/remove_unused_missing_requests_error | Rafael França | 2017-10-30 | 2 | -4/+0 |
|\ \ | | | | | | | Remove unused `MissingRequestError` | ||||
| * | | Remove unused `MissingRequestError` | yuuji.yaginuma | 2017-10-31 | 2 | -4/+0 |
| | | | | | | | | | | | | `MissingRequestError` is no longer used since 1e2b0ce. | ||||
* | | | `source_type_scope` should respect correct table alias | Ryuta Kamizono | 2017-10-30 | 2 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `join_scopes` in `PolymorphicReflection` is passed aliased `table`, so it should be respected for `source_type_scope`. Closes #13969. Fixes #13920. Fixes #15190. | ||||
* | | | `PolymorphicReflection#scopes` is no longer used since a5651eb5 | Ryuta Kamizono | 2017-10-30 | 1 | -5/+0 |
| | | | |||||
* | | | Merge pull request #31002 from ta1kt0me/call_ajax_without_beforeSend | Guillermo Iguaran | 2017-10-29 | 3 | -2/+29 |
|\ \ \ | | | | | | | | | Call Rails.ajax without beforeSend | ||||
| * | | | Enable to call Rails.ajax without beforeSend | ta1kt0me | 2017-10-28 | 3 | -2/+29 |
| | | | | |||||
* | | | | Merge pull request #31007 from suginoy/doc_integer_bigint | Ryuta Kamizono | 2017-10-29 | 4 | -20/+20 |
|\ \ \ \ | | | | | | | | | | | [ci skip]Update the documentation about the primary key type | ||||
| * | | | | [ci skip]Update the documentation about the primary key type | suginoy | 2017-10-29 | 4 | -20/+20 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Replace the primary key type `integer` in docs with `bigint`. ref #26266 | ||||
* | | | | Merge pull request #30996 from tscoville2012/tscoville2012-patch-1 | Eileen M. Uchitelle | 2017-10-28 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | 5_1_release_notes include more removals [ci skip] | ||||
| * | | | | [ci skip] Updated 5_1_release_notes.md to include support to :text and ↵ | Tyler Scoville | 2017-10-27 | 1 | -0/+4 |
| | |/ / | |/| | | | | | | | | | | :nothing in render | ||||
* | | | | Merge pull request #31005 from shuheiktgw/remove_unnecessary_semicolons | Matthew Draper | 2017-10-28 | 11 | -20/+24 |
|\ \ \ \ | | | | | | | | | | | | | | | | Removed unnecessary semicolons | ||||
| * | | | | removed unnecessary semicolons | Shuhei Kitagawa | 2017-10-28 | 7 | -17/+17 |
| | |_|/ | |/| | | |||||
* / | | | Keep rubocop happy with the new Selenium runner | Matthew Draper | 2017-10-28 | 1 | -4/+6 |
|/ / / | |||||
* | | | Merge pull request #31003 from y-yagi/add_load_hook_for_system_test_case | Ryuta Kamizono | 2017-10-28 | 2 | -0/+3 |
|\ \ \ | | | | | | | | | Add load hook for `ActionDispatch::SystemTestCase` | ||||
| * | | | Add load hook for `ActionDispatch::SystemTestCase` | yuuji.yaginuma | 2017-10-28 | 2 | -0/+3 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | This is useful to extend `SystemTestCase`. Also, since other test classes already have load hooks, should also be in `SystemTestCase`. Ref: 0510208dd1ff23baa619884c0abcae4d141fae53 | ||||
* | | | Merge pull request #31001 from eugeneius/rm_x_post_data_format_doc | Ryuta Kamizono | 2017-10-28 | 1 | -3/+0 |
|\ \ \ | | | | | | | | | Remove mention of X-Post-Data-Format header [ci skip] | ||||
| * | | | Remove mention of X-Post-Data-Format header [ci skip] | Eugene Kenny | 2017-10-28 | 1 | -3/+0 |
| | |/ | |/| | | | | | | | | | | Support for this header was removed when `actionpack-xml_parser` was extracted, and has since been dropped from the gem. | ||||
* / | | Puma Rack handler is required by Capybara | Guillermo Iguaran | 2017-10-28 | 1 | -2/+0 |
|/ / | | | | | See: https://github.com/teamcapybara/capybara/blob/7d693f068c44f6a460336da70fb6e9e5f94f3db9/lib/capybara.rb#L450 | ||||
* | | Remove CHANGELOG entry for PR #28681 [ci skip] | Prathamesh Sonpatki | 2017-10-27 | 1 | -4/+0 |
| | | | | | | | | | | - It is present in Rails 5.1.3 already. - Backport commit https://github.com/rails/rails/commit/9efa0b70a638dcfdc05b30ab530f89f2847bb9c2 | ||||
* | | Fix all `s/trough/through/` | Ryuta Kamizono | 2017-10-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | ``` % git grep -n trough activerecord/test/cases/associations/has_many_through_associations_test.rb:1253: def test_has_many_trough_with_scope_that_has_joined_same_table_with_parent_relation ``` | ||||
* | | Fix typo `s/trough/through/` | Ryuta Kamizono | 2017-10-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #30682 from ahorek/fix_scope_for | Ryuta Kamizono | 2017-10-27 | 6 | -1/+11 |
|\ \ | | | | | | | delegate scope_for on PolymorphicReflection | ||||
| * | | delegate scope for | pavel | 2017-10-27 | 6 | -1/+11 |
| |/ | |||||
* | | Merge pull request #30995 from ahorek/fix_initial_count | Ryuta Kamizono | 2017-10-27 | 2 | -1/+5 |
|\ \ | |/ |/| | fix initial count | ||||
| * | fix initial count | pavel | 2017-10-27 | 2 | -1/+5 |
|/ | |||||
* | Merge pull request #30674 from prognostikos/allow_procs_for_length_validator | Rafael França | 2017-10-26 | 3 | -2/+43 |
|\ | | | | | Allow passing a Proc or Symbol as an argument to length validator values | ||||
| * | Allow passing a Proc or Symbol as an argument to length validator values | Matt Rohrer | 2017-10-26 | 3 | -2/+43 |
|/ | | | | | This brings the Length validator in line with the Numericality validator, which currently supports Proc & Symbol arguments | ||||
* | Merge pull request #30991 from y-yagi/remove_mention_about_evented_redis | Ryuta Kamizono | 2017-10-26 | 1 | -2/+2 |
|\ | | | | | Remove mention about Evented Redis [ci skip] | ||||
| * | Remove mention about Evented Redis [ci skip] | yuuji.yaginuma | 2017-10-26 | 1 | -2/+2 |
| | | | | | | | | Evented Redis adapter was removed in 48766e32d31651606b9f68a16015ad05c3b0de2c. | ||||
* | | Merge pull request #30989 from joevandyk/patch-3 | Ryuta Kamizono | 2017-10-26 | 1 | -3/+1 |
|\ \ | |/ |/| | remove incorrect comment about serializable transactions [ci skip] | ||||
| * | remove incorrect statement about serializable transactions | Joe Van Dyk | 2017-10-25 | 1 | -3/+1 |
|/ | | | using serializable isolation would prevent the duplicate insert as done in the example from happening | ||||
* | Merge pull request #30813 from y-yagi/remove_unused_secrets_yml | Ryuta Kamizono | 2017-10-26 | 2 | -36/+0 |
|\ | | | | | Remove unused `secrets.yml` template | ||||
| * | Remove unused `secrets.yml` template | yuuji.yaginuma | 2017-10-06 | 2 | -36/+0 |
| | | | | | | | | | | `secrets.yml` no longer used since #30067. Together, removed `app_secret` method that only used in `secrets.yml` | ||||
* | | Third party adapters doesn't support index orders yet | Ryuta Kamizono | 2017-10-26 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #30984 from yahonda/schema_dumper_pg | Ryuta Kamizono | 2017-10-26 | 2 | -9/+13 |
|\ \ | | | | | | | Move `extensions` to `PostgreSQL::SchemaDumper` | ||||
| * | | Implement `PostgreSQL::SchemaDumper#extensions` | Yasuo Honda | 2017-10-25 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | and abstract `SchemaDumper#extensions` is now an empty method. Since #30337, every database adapter has its own `SchemaDumper`. `extensions` are only supported by PostgreSQL database and postgresql database adapter. | ||||
* | | | Remove CHANGELOG entry that was backported to Rails 5.1.3. [ci skip] (#30986) | प्रथमेश Sonpatki | 2017-10-25 | 1 | -7/+0 |
| | | | | | | | | | - Backport commit: https://github.com/rails/rails/commit/7122a2cdc3634e170129f8b6cabd1e8fbed13c3d | ||||
* | | | Merge pull request #30965 from kmanzana/master | Rafael Mendonça França | 2017-10-25 | 2 | -0/+22 |
|\ \ \ | | | | | | | | | | | | | Wrap accepted nested attributes params | ||||
| * | | | checking for nested attributes when attribute names specified to wrap them ↵ | Kelton Manzanares | 2017-10-25 | 2 | -6/+21 |
| | | | | | | | | | | | | | | | | as well | ||||
| * | | | Fixed functionality to include method in params_wrapper.rb | Ryan Perez | 2017-10-25 | 1 | -0/+7 |
|/ / / | | | | | | | | | | to properly wrap all attributes, including those which are nested. | ||||
* | | | Merge pull request #30970 from rohitpaulk/fix-sqlite-3-index-order-dump | Rafael França | 2017-10-25 | 3 | -2/+19 |
|\ \ \ | | | | | | | | | Save index order :desc to schema.rb (sqlite). Fixes #30902 | ||||
| * | | | Avoid using index_xinfo, only available in sqlite >= 3.8.9 | Paul Kuruvilla | 2017-10-25 | 1 | -9/+12 |
| | | | | |||||
| * | | | Save index order :desc to schema.rb (sqlite). Fixes #30902 | Paul Kuruvilla | 2017-10-24 | 3 | -3/+17 |
| | | | | | | | | | | | | | | | | | | | | Although the sqlite adapter supports index sort orders, they weren't being written to db/schema.rb. | ||||
* | | | | Merge pull request #30982 from willnet/add-space-before-curly-brace | Rafael França | 2017-10-25 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | [ci skip]Add space before closing curly brace | ||||
| * | | | | [ci skip]Add space before closing curly brace | willnet | 2017-10-25 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Require capybara 2.15 because we depend on the new puma integration | Rafael Mendonça França | 2017-10-25 | 1 | -1/+1 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #30513 from y-yagi/fix_30444 | Akira Matsuda | 2017-10-25 | 2 | -2/+4 |
|\ \ \ \ | |/ / / |/| | | | Does not include disabled element in params | ||||
| * | | | Does not include disabled element in params | yuuji.yaginuma | 2017-09-03 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of remote, it should be the same behavior as submitting HTML form. Fixes #30444 |