aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Avoid overwriting the methods of `AttributeMethods::PrimaryKey`Ryuta Kamizono2017-06-074-19/+24
| | | | | | | | | Currently the methods of `AttributeMethods::PrimaryKey` are overwritten by `define_attribute_methods`. It will be broken if a table that customized primary key has non primary key id column. It should not be overwritten if a table has any primary key. Fixes #29350.
* Cache: write_multi (#29366)Jeremy Daer2017-06-063-6/+100
| | | | | | | | | | | Rails.cache.write_multi foo: 'bar', baz: 'qux' Plus faster `fetch_multi` with stores that implement `write_multi_entries`. Keys that aren't found may be written to the cache store in one shot instead of separate writes. The default implementation simply calls `write_entry` for each entry. Stores may override if they're capable of one-shot bulk writes, like Redis `MSET`.
* Merge pull request #29377 from edwardmp/fix-upgrading-docsRafael França2017-06-061-1/+1
|\ | | | | Update upgrading guide w.r.t. Parameters to use other example method …
| * Update upgrading guide w.r.t. Parameters to use other example method than ↵edwardmp2017-06-061-1/+1
|/ | | | slice as this has actually been implemented by Parameters
* Merge pull request #28868 from yahonda/pg10_oid_unknown_to_textMatthew Draper2017-06-071-8/+8
|\ | | | | PostgreSQL 10 converts unknown type to text type
| * PostgreSQL 10 converts unknown OID 705 to text 25Yasuo Honda2017-06-061-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rename test cases from `unknown` to `unrecognized` since unknown OID is one of possible unrecognized types by Rails - Use "select 'pg_catalog.pg_class'::regclass" whose OID is 2205, which will not be converted to recognized type in PostgreSQL 10. activerecord_unittest=# select oid, typname from pg_type where oid in (2205, 2277); oid | typname ------+---------- 2205 | regclass 2277 | anyarray (2 rows) Addresses #28868
* | Remove invalid entry from the guides index pageRobin Dupret2017-06-061-5/+0
| | | | | | | | | | | | | | Commit 1a5d9399 removed the "Profiling Rails Applications" guide but the YAML entry for this guide wasn't. [ci skip]
* | Tiny documentation fixes [ci skip]Robin Dupret2017-06-062-6/+6
| |
* | Merge pull request #29362 from kamipo/remove_redundant_assert_nothing_raisedMatthew Draper2017-06-063-11/+0
|\ \ | | | | | | Remove redundant `assert_nothing_raised` before another assertions
| * | Remove redundant `assert_nothing_raised` before another assertionsRyuta Kamizono2017-06-063-11/+0
| | | | | | | | | | | | These `assert_nothing_raised` are covered by following assertions.
* | | Merge pull request #29370 from koic/fix_test_pluck_without_column_names_oracleMatthew Draper2017-06-061-2/+5
|\ \ \ | |_|/ |/| | Fix `test_pluck_without_column_names` when using Oracle
| * | Fix `test_pluck_without_column_names` when using OracleKoichi ITO2017-06-061-2/+5
| | |
* | | Let's test nokogiri 1.8 against edge Rails, and vice versaAkira Matsuda2017-06-061-8/+8
| | |
* | | Merge pull request #29364 from lostapathy/patch-2Ryuta Kamizono2017-06-061-1/+0
|\ \ \ | | | | | | | | Remove html tag making markdown misrender [ci skip]
| * | | Remove html tag making markdown misrender [ci skip]Joe Francis2017-06-051-1/+0
|/ / /
* / / Fix indentation + Add backticks [ci skip]Ryuta Kamizono2017-06-061-2/+4
|/ /
* / [ci skip] UNIQUE constraint affects not only INSERT but also UPDATERyuta Kamizono2017-06-061-1/+1
|/
* Merge pull request #29356 from ↵Eileen M. Uchitelle2017-06-052-151/+132
|\ | | | | | | | | kamipo/testing_reserved_word_test_for_all_adapters Testing `ReservedWordTest` for all adapters
| * Testing `ReservedWordTest` for all adaptersRyuta Kamizono2017-06-052-151/+132
| | | | | | | | | | `ReservedWordTest` expects that any identifiers are quoted properly. It should be tested for all adapters.
* | Remove deprecated passing of string to :if/:unless (#29357)Joe Francis2017-06-061-1/+1
|/ | | | | Other examples were removed in 53ff5fc62f9d11b6f60d371df959137f4bf40728 [ci skip]
* Merge pull request #29347 from prathamesh-sonpatki/rm-assert-nothin-raisedEileen M. Uchitelle2017-06-041-3/+3
|\ | | | | Remove assert_nothing_raised, as test is already testing the required concerns
| * Remove assert_nothing_raised, as test is already testing the required concernsPrathamesh Sonpatki2017-06-031-3/+3
| |
* | Don't mark the schema loaded until it's really finishedMatthew Draper2017-06-051-3/+5
| | | | | | | | | | load_schema! is overridden by attribute modules, so we need to wait until it has returned.
* | Merge pull request #29294 from gsamokovarov/attributes-defaultKasper Timm Hansen2017-06-0439-150/+134
|\ \ | | | | | | Introduce mattr_accessor default option
| * | Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-0336-125/+69
| | |
| * | Implement mattr_acessor :default optionGenadi Samokovarov2017-06-033-25/+65
| | |
* | | Merge pull request #29351 from vipulnsward/unnecessary-assignmentMatthew Draper2017-06-041-3/+3
|\ \ \ | | | | | | | | Don't create extra assignment, just return
| * | | Don't create extra assignment, just returnVipul A M2017-06-041-3/+3
|/ / /
* | | Merge pull request #29348 from andrehjr/fix-typo-route-definition-ambiguousMatthew Draper2017-06-041-1/+1
|\ \ \ | |_|/ |/| | Fix typo on error message when route definition is ambiguous.
| * | Fix typo on error message when route definition is ambiguous.André Luis Leal Cardoso Junior2017-06-031-1/+1
|/ /
* | [ci skip] Fix typo in the system tests docsPrathamesh Sonpatki2017-06-031-1/+1
| |
* | [ci skip] Add missing `be`Prathamesh Sonpatki2017-06-031-1/+1
| |
* | Merge pull request #29344 from y-yagi/fix_doc_formatKasper Timm Hansen2017-06-031-14/+14
|\ \ | |/ |/| Fix formatting of `direct` and `resolve` doc [ci skip]
| * Fix formatting of `direct` and `resolve` doc [ci skip]yuuji.yaginuma2017-06-031-14/+14
| |
* | Merge pull request #29342 from koic/change_application_js_included_in_rails_appMatthew Draper2017-06-031-3/+3
|\ \ | | | | | | Change default application.js included in new Rails app [ci skip]
| * | Change default application.js included in new Rails app [ci skip]Koichi ITO2017-06-031-3/+3
| | |
* | | Merge pull request #29343 from koic/remove_redundant_default_scope_testsMatthew Draper2017-06-031-10/+0
|\ \ \ | |/ / |/| | Remove a redundant default_scope tests
| * | Remove a redundant default_scope testsKoichi ITO2017-06-031-10/+0
|/ /
* | Merge pull request #29340 from lucascaton/masterMatthew Draper2017-06-031-4/+14
|\ \ | |/ |/| Make Rails welcome page responsive
| * Make Rails welcome page responsiveLucas Caton2017-06-031-4/+14
|/
* Merge pull request #29079 from ↵Eileen M. Uchitelle2017-06-021-1/+1
|\ | | | | | | | | orhantoy/feature/fix-scaffold_controller-generator-usage [ci skip] Fix `scaffold_controller` generator usage
| * [ci skip] Fix `scaffold_controller` generator usageOrhan Toy2017-05-291-1/+1
| |
* | Merge pull request #29101 from ccarruitero/system_guideEileen M. Uchitelle2017-06-021-10/+8
|\ \ | | | | | | some typos and rephrasing in system test guide [ci skip]
| * | some typos and rephrasing in system test guide [ci skip]Cesar Carruitero2017-05-161-10/+8
| | |
* | | Merge pull request #29135 from ↵Eileen M. Uchitelle2017-06-021-0/+19
|\ \ \ | | | | | | | | | | | | | | | | Nerian/document_support_for_composite_primary_keys Document support for composite primary keys
| * | | Document support for composite primary keysNerian2017-05-181-0/+19
| | | |
* | | | Merge pull request #29282 from ↵Eileen M. Uchitelle2017-06-025-9/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/prevent_making_bind_param_if_casted_value_is_nil Prevent making bind param if casted value is nil
| * | | | Prevent making bind param if casted value is nilRyuta Kamizono2017-05-315-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If casted value is nil, generated SQL should be `IS NULL`. But currently it is generated as `= NULL`. To prevent this behavior, avoid making bind param if casted value is nil. Fixes #28945.
* | | | | Merge pull request #29324 from koic/remove_redundant_test_find_all_with_joinEileen M. Uchitelle2017-06-021-10/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove the redundant `test_find_all_with_join` in AR
| * | | | | Remove the redundant `test_find_all_with_join` in ARKoichi ITO2017-06-021-10/+0
| | | | | |