aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into add_database_exist_methodGuillermo Iguaran2019-07-0892-221/+795
|\
| * Merge pull request #36617 from wjessop/fix_database_url_trampling_other_env_c...Eileen M. Uchitelle2019-07-082-5/+24
| |\
| | * When DATABASE_URL is specified don't trample envs that use a url: keyWill Jessop2019-07-082-5/+24
| |/
| * Merge pull request #36616 from kamipo/dont_use_alias_for_grouped_fieldRyuta Kamizono2019-07-082-1/+8
| |\
| | * Do not use aliases in GROUP BY clauseRyuta Kamizono2019-07-082-1/+8
| * | Implement ActiveStorage::Blob#attachable_plain_text_representationGeorge Claghorn2019-07-072-0/+9
| * | Should `Regexp.escape` quoted table name in regexRyuta Kamizono2019-07-087-115/+51
| |/
| * Merge pull request #36443 from jhawthorn/as_parallelization_process_nameJohn Hawthorn2019-07-061-0/+11
| |\
| | * Set process name of parallelized test workersJohn Hawthorn2019-06-071-0/+11
| * | Merge pull request #36602 from jhawthorn/system_testing_preload_2John Hawthorn2019-07-063-4/+14
| |\ \
| | * | Bump minimum selenium-webdriver versionJohn Hawthorn2019-07-042-2/+2
| | * | Fix Browser#preload for older SeleniumJohn Hawthorn2019-07-041-2/+12
| * | | Merge pull request #36604 from kamipo/fix_schema_dumping_enumRyuta Kamizono2019-07-076-7/+55
| |\ \ \
| | * | | MySQL: Fix schema dumping `enum` and `set` columns correctlyRyuta Kamizono2019-07-056-7/+55
| | |/ /
| * | | Merge pull request #36605 from jmondo/patch-3Ryuta Kamizono2019-07-061-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Update docs on dirty.rbJohn Gesimondo2019-07-051-1/+1
| |/ /
| * | Merge pull request #36592 from jhawthorn/system_testing_preloadJohn Hawthorn2019-07-044-0/+29
| |\ \
| | * | Preload browser driver_path for system testingJohn Hawthorn2019-07-034-0/+29
| * | | Fix a typo by removing extra article [ci skip]jacobherrington2019-07-041-1/+1
| * | | Merge pull request #36594 from jacobherrington/doc/rephrase-ski-ci-instructionsPrem Sichanugrist2019-07-041-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Update docs regarding skipping CI tests [ci skip]jacobherrington2019-07-031-1/+1
| |/ /
| * | Merge pull request #36585 from tr4b4nt/patch-1Eileen M. Uchitelle2019-07-031-1/+1
| |\ \
| | * | Replace replica with primary in automatic connection switching after write in...tr4b4nt2019-07-021-1/+1
| * | | Merge pull request #36534 from y-yagi/fixes_35137Yuji Yaginuma2019-07-037-12/+120
| |\ \ \ | | |/ / | |/| |
| | * | Add the ability to set the CSP nonce only to the specified directivesyuuji.yaginuma2019-06-227-12/+120
| * | | Revert "Merge pull request #36582 from f1337/master"Ryuta Kamizono2019-07-021-2/+2
| * | | Merge pull request #36582 from f1337/masterRyuta Kamizono2019-07-021-2/+2
| |\ \ \
| | * | | use 'template' instead of 'create_file' for erb templates in generators guide...Michael R Fleet2019-07-011-2/+2
| |/ / /
| * | | bumps ZeitwerkXavier Noria2019-06-302-3/+3
| * | | adds two sections to the upgrading notes for autoloading [skip ci]Xavier Noria2019-06-301-0/+16
| * | | Make `bin/setup` test pass even if the database does not existyuuji.yaginuma2019-06-301-1/+1
| * | | Link to top of PR as well as other links [ci skip]yuuji.yaginuma2019-06-291-1/+1
| * | | Add "SCHEMA" to the query in `configure_connection` like as other adaptersRyuta Kamizono2019-06-281-1/+1
| * | | warning: instance variable @serial not initialized (#36556)utilum2019-06-281-0/+10
| * | | Merge pull request #36565 from rails/fix-url-configsEileen M. Uchitelle2019-06-273-2/+33
| |\ \ \
| | * | | Fix broken url configseileencodes2019-06-273-2/+33
| * | | | Address to "DEPRECATION WARNING: Uniqueness validator will no longer enforce ...Ryuta Kamizono2019-06-281-1/+1
| |/ / /
| * | | Merge pull request #36560 from eileencodes/warn-if-database-yml-cant-be-readEileen M. Uchitelle2019-06-273-9/+48
| |\ \ \
| | * | | Load initial database.yml once, and warn if we can't create taskseileencodes2019-06-273-9/+48
| * | | | [ci skip] Update free-programming-books link in getting started guideMasayuki Morita2019-06-261-1/+1
| * | | | `length(title)` is a safe SQL string since #36448Ryuta Kamizono2019-06-261-2/+2
| * | | | Merge pull request #36555 from dineshpanda/update-initialization-guideRafael França2019-06-251-0/+4
| |\ \ \ \
| | * | | | [ci skip] Refer actionmailbox and actiontext in the guidedineshpanda2019-06-261-0/+4
| |/ / / /
| * | | | Merge pull request #36553 from tatsuyafw/fix-robots-txt-urlRyuta Kamizono2019-06-252-2/+2
| |\ \ \ \
| | * | | | Replace the www.robotstxt.org URL with https one [ci skip]Tatsuya Hoshino2019-06-252-2/+2
| |/ / / /
| * | | | Merge pull request #36530 from benoittgt/source_annotation_deprecation_issueRafael França2019-06-241-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Rely on Kernel require instead of self requireBenoit Tigeot2019-06-221-1/+1
| | |/ /
| * | | Merge pull request #36210 from vishaltelangre/raise-record-invalid-when-assoc...Rafael França2019-06-244-1/+49
| |\ \ \
| | * | | Fix: ActiveRecord::RecordInvalid is not raised when an associated record fail...Vishal Telangre2019-05-104-1/+49
| * | | | Update link to OWASP XSS cheat sheet [ci skip]Aaron Suarez2019-06-231-1/+1