aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #30996 from tscoville2012/tscoville2012-patch-1Eileen M. Uchitelle2017-10-281-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 Scoville2017-10-271-0/+4
| | | | | | | | :nothing in render
* | Merge pull request #31005 from shuheiktgw/remove_unnecessary_semicolonsMatthew Draper2017-10-2811-20/+24
|\ \ | | | | | | | | | Removed unnecessary semicolons
| * | removed unnecessary semicolonsShuhei Kitagawa2017-10-287-17/+17
| | |
* | | Keep rubocop happy with the new Selenium runnerMatthew Draper2017-10-281-4/+6
|/ /
* | Merge pull request #31003 from y-yagi/add_load_hook_for_system_test_caseRyuta Kamizono2017-10-282-0/+3
|\ \ | | | | | | Add load hook for `ActionDispatch::SystemTestCase`
| * | Add load hook for `ActionDispatch::SystemTestCase`yuuji.yaginuma2017-10-282-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_docRyuta Kamizono2017-10-281-3/+0
|\ \ | | | | | | Remove mention of X-Post-Data-Format header [ci skip]
| * | Remove mention of X-Post-Data-Format header [ci skip]Eugene Kenny2017-10-281-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 CapybaraGuillermo Iguaran2017-10-281-2/+0
|/ / | | | | See: https://github.com/teamcapybara/capybara/blob/7d693f068c44f6a460336da70fb6e9e5f94f3db9/lib/capybara.rb#L450
* | Remove CHANGELOG entry for PR #28681 [ci skip]Prathamesh Sonpatki2017-10-271-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 Kamizono2017-10-271-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 Kamizono2017-10-271-1/+1
| |
* | Merge pull request #30682 from ahorek/fix_scope_forRyuta Kamizono2017-10-276-1/+11
|\ \ | | | | | | delegate scope_for on PolymorphicReflection
| * | delegate scope forpavel2017-10-276-1/+11
| |/
* | Merge pull request #30995 from ahorek/fix_initial_countRyuta Kamizono2017-10-272-1/+5
|\ \ | |/ |/| fix initial count
| * fix initial countpavel2017-10-272-1/+5
|/
* Merge pull request #30674 from prognostikos/allow_procs_for_length_validatorRafael França2017-10-263-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 valuesMatt Rohrer2017-10-263-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_redisRyuta Kamizono2017-10-261-2/+2
|\ | | | | Remove mention about Evented Redis [ci skip]
| * Remove mention about Evented Redis [ci skip]yuuji.yaginuma2017-10-261-2/+2
| | | | | | | | Evented Redis adapter was removed in 48766e32d31651606b9f68a16015ad05c3b0de2c.
* | Merge pull request #30989 from joevandyk/patch-3Ryuta Kamizono2017-10-261-3/+1
|\ \ | |/ |/| remove incorrect comment about serializable transactions [ci skip]
| * remove incorrect statement about serializable transactionsJoe Van Dyk2017-10-251-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_ymlRyuta Kamizono2017-10-262-36/+0
|\ | | | | Remove unused `secrets.yml` template
| * Remove unused `secrets.yml` templateyuuji.yaginuma2017-10-062-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 yetRyuta Kamizono2017-10-261-2/+2
| |
* | Merge pull request #30984 from yahonda/schema_dumper_pgRyuta Kamizono2017-10-262-9/+13
|\ \ | | | | | | Move `extensions` to `PostgreSQL::SchemaDumper`
| * | Implement `PostgreSQL::SchemaDumper#extensions`Yasuo Honda2017-10-252-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)प्रथमेश Sonpatki2017-10-251-7/+0
| | | | | | | | | - Backport commit: https://github.com/rails/rails/commit/7122a2cdc3634e170129f8b6cabd1e8fbed13c3d
* | | Merge pull request #30965 from kmanzana/masterRafael Mendonça França2017-10-252-0/+22
|\ \ \ | | | | | | | | | | | | Wrap accepted nested attributes params
| * | | checking for nested attributes when attribute names specified to wrap them ↵Kelton Manzanares2017-10-252-6/+21
| | | | | | | | | | | | | | | | as well
| * | | Fixed functionality to include method in params_wrapper.rbRyan Perez2017-10-251-0/+7
|/ / / | | | | | | | | | to properly wrap all attributes, including those which are nested.
* | | Merge pull request #30970 from rohitpaulk/fix-sqlite-3-index-order-dumpRafael França2017-10-253-2/+19
|\ \ \ | | | | | | | | Save index order :desc to schema.rb (sqlite). Fixes #30902
| * | | Avoid using index_xinfo, only available in sqlite >= 3.8.9Paul Kuruvilla2017-10-251-9/+12
| | | |
| * | | Save index order :desc to schema.rb (sqlite). Fixes #30902Paul Kuruvilla2017-10-243-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-braceRafael França2017-10-251-2/+2
|\ \ \ \ | | | | | | | | | | [ci skip]Add space before closing curly brace
| * | | | [ci skip]Add space before closing curly bracewillnet2017-10-251-2/+2
| | | | |
* | | | | Require capybara 2.15 because we depend on the new puma integrationRafael Mendonça França2017-10-251-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #30513 from y-yagi/fix_30444Akira Matsuda2017-10-252-2/+4
|\ \ \ \ | |/ / / |/| | | Does not include disabled element in params
| * | | Does not include disabled element in paramsyuuji.yaginuma2017-09-032-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of remote, it should be the same behavior as submitting HTML form. Fixes #30444
* | | | Merge pull request #30978 from y-yagi/change_vendor_path_to_app_rootGeorge Claghorn2017-10-241-2/+2
|\ \ \ \ | | | | | | | | | | Change `VENDOR_PATH` to `APP_ROOT` in `bin/yarn`
| * | | | Change `VENDOR_PATH` to `APP_ROOT` in `bin/yarn`yuuji.yaginuma2017-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable was initially used to hold the vendor directory. https://github.com/rails/rails/commit/3dac36b Therefore, the variable name `VENDOR_PATH` was appropriate. However, `package.json` is now placed in the root of the project. https://github.com/rails/rails/commit/8e9e943 Therefore, like other bin scripts, I think the variable name `APP_ROOT` is appropriate. https://github.com/rails/rails/blob/2c845f6b03ddf2aa233b00385d24d769a4a34fa6/railties/lib/rails/generators/rails/app/templates/bin/setup.tt#L5 https://github.com/rails/rails/blob/2c845f6b03ddf2aa233b00385d24d769a4a34fa6/railties/lib/rails/generators/rails/app/templates/bin/update.tt#L5
* | | | | Merge pull request #30976 from yahonda/supports_extensions_always_trueRafael França2017-10-246-488/+466
|\ \ \ \ \ | | | | | | | | | | | | `supports_extensions?` return always true since PostgreSQL 9.1
| * | | | | `supports_extensions?` return always true since PostgreSQL 9.1Yasuo Honda2017-10-246-488/+466
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since the minimum version of PostgreSQL currently Rails supports is 9.1, there is no need to handle if `supports_extensions?` Refer https://www.postgresql.org/docs/9.1/static/sql-createextension.html "CREATE EXTENSION"
* | | | | Merge pull request #30975 from ↵Rafael França2017-10-242-33/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/simplify-api-domcumentation-of-durations Simplify API documentation of methods that return a Duration
| * | | | | Simplify API documentation of methods that return a Durationbogdanvlviv2017-10-242-33/+10
|/ / / / / | | | | | | | | | | | | | | | Related to #30972
* | | | | Merge pull request #30972 from jcmfernandes/update-core_ext-time-documentationRafael França2017-10-243-11/+39
|\ \ \ \ \ | |_|_|/ / |/| | | | Make clear that Time core extensions are split between Numeric and Integer
| * | | | Make clear that Time core extensions are split between Numeric and IntegerJoão Fernandes2017-10-243-11/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation wrongly suggests that Time extensions to Numeric include methods months and years, when these belong to Integer. Update both classes and guides.
* | | | | Merge pull request #30966 from gurgelrenan/patch-1Rafael França2017-10-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Space between { and | missing.
| * | | | | add _ for unused last argRenan Gurgel2017-10-241-1/+1
| | | | | |