aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #34034 from runephilosof/patch-2Gannon McGibbon2018-10-241-0/+3
|\
| * Make it easier to find abort documentationRune Philosof2018-10-011-0/+3
* | Merge pull request #34302 from kylekeesling/activestorage-attachment-model-docsRobin Dupret2018-10-241-3/+2
|\ \
| * | update activestorage attachment model documentation reflect recent behavior c...Kyle Keesling2018-10-241-3/+2
|/ /
* | Merge pull request #34080 from baerjam/add-email-observer-to-guidesGannon McGibbon2018-10-231-5/+24
|\ \
| * | Add observing emails to action mailer guide [ci skip]James Baer2018-10-041-5/+24
* | | Do not need to mention the method that is being called in the exceptionRafael Mendonça França2018-10-231-1/+1
* | | Merge pull request #34275 from bogdanvlviv/skip_yarn-to-skip_javascriptRafael França2018-10-2310-27/+17
|\ \ \
| * | | Remove node_modules path from assets load paths since we use webpack by defaultbogdanvlviv2018-10-222-9/+1
| * | | Remove `--skip-yarn` in favor of `--skip-javascript`bogdanvlviv2018-10-2210-19/+17
* | | | Merge pull request #34297 from albertoalmagro/full-remove-upgrade-information...Robin Dupret2018-10-231-5/+0
|\ \ \ \
| * | | | Fully remove duplicated upgrade information [ci skip]Alberto Almagro2018-10-231-5/+0
|/ / / /
* | | | Merge pull request #34295 from ohbarye/fix-typo-of-duplicated-theGeorge Claghorn2018-10-232-2/+2
|\ \ \ \
| * | | | Fix typo of duplicated `the` [ci skip]ohbarye2018-10-242-2/+2
|/ / / /
* | | | Merge pull request #34294 from frodsan/patch-1Ryuta Kamizono2018-10-231-1/+1
|\ \ \ \
| * | | | Hide PG::Connection from API docs [ci skip]Francesco Rodríguez2018-10-231-1/+1
|/ / / /
* | | | Merge pull request #34293 from tzmfreedom/fix_prlink_upgrade_5_1Ryuta Kamizono2018-10-231-1/+1
|\ \ \ \
| * | | | Fix PullRequest link to datetime_field changes on Rails 5.1 Release Notestzmfreedom2018-10-231-1/+1
|/ / / /
* | | | Merge pull request #34292 from yahonda/mysql8013Ryuta Kamizono2018-10-231-1/+3
|\ \ \ \
| * | | | MySQL 8.0.13 raises `ER_NO_REFERENCED_ROW` and `ER_ROW_IS_REFERENCED`Yasuo Honda2018-10-231-1/+3
|/ / / /
* | | | Merge pull request #34286 from rails/fix-csp-dynamic-sourcesAndrew White2018-10-233-6/+41
|\ \ \ \
| * | | | Use request object for context if there's no controllerAndrew White2018-10-223-3/+20
| * | | | Apply mapping to symbols returned from dynamic CSP sourcesAndrew White2018-10-223-3/+21
| |/ / /
* | | | Merge pull request #34284 from bogdanvlviv/remove-mention-about-javascript-fr...Rafael França2018-10-231-5/+1
|\ \ \ \
| * | | | Remove mentions about `javascripts` option from the guide about generators [c...bogdanvlviv2018-10-221-5/+1
* | | | | Merge pull request #34290 from aergonaut/docs/ActiveSupport--Notifications-su...Rafael França2018-10-231-0/+18
|\ \ \ \ \
| * | | | | Add docs to ActiveSupport::Notifications.subscribeChris Fung2018-10-221-0/+18
* | | | | | Merge pull request #34261 from matildasmeds/guides_remove_upgrade_section_fro...Ryuta Kamizono2018-10-231-57/+0
|\ \ \ \ \ \
| * | | | | | Remove "Upgrading Old Versions" from Asset Pipeline Guide [skip ci]Matilda Smeds2018-10-191-57/+0
* | | | | | | Merge pull request #34289 from jschulenklopper/patch-1George Claghorn2018-10-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add missing dot in comment in .gitignore templateJochem Schulenklopper2018-10-221-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #34222 from bogdanvlviv/unify-changelog-entriesRafael França2018-10-221-24/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Unify changelog entries related to `database` option of Rails generators [ci ...bogdanvlviv2018-10-161-24/+8
* | | | | | | Merge pull request #34278 from GeniusStorm/remove_dependent_destroy_from_belo...Gannon McGibbon2018-10-221-3/+2
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Fix #33914Raghu Kamat2018-10-221-3/+2
|/ / / / / / /
* | | | | | | Merge pull request #34241 from gmcgibbon/clarify_i18n_load_paths_gotchaRafael França2018-10-221-1/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | [ci skip] Clarify load_paths behaviourGannon McGibbon2018-10-221-0/+2
| * | | | | | [ci skip] Remove explicit to_s for consistency with other exampleTrevor Wistaff2018-10-161-1/+1
* | | | | | | Merge pull request #34279 from bogdanvlviv/remove-extra-remove_file-skip_acti...Ryuta Kamizono2018-10-221-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove extra call `remove_file` on `rails new` with `--skip_action_cable`bogdanvlviv2018-10-221-1/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #34273 from albertoalmagro/improve-event-variable-namingEileen M. Uchitelle2018-10-221-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Rename event variableAlberto Almagro2018-10-211-4/+4
* | | | | | | | Merge pull request #34274 from bogdanvlviv/remove-yarn-files-from-gitignore-t...Ryuta Kamizono2018-10-223-17/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add `/yarn-error.log` to `.gitignore`bogdanvlviv2018-10-211-1/+2
| * | | | | | | Remove yarn's files from `.gitignore` template for new rails appbogdanvlviv2018-10-212-16/+1
* | | | | | | | Merge pull request #34277 from bogdanvlviv/remove-javascripts-javascripts_eng...Ryuta Kamizono2018-10-222-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove `javascripts` and `javascript_engine` options for generatorsbogdanvlviv2018-10-222-4/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #34276 from bogdanvlviv/remove-javascript-option-from-the-...Ryuta Kamizono2018-10-221-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove `:javascript` from `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`bogdanvlviv2018-10-221-1/+1
|/ / / / / / /
* | | | | | | Correct some tests related to changes in #33079 (#34272)Bogdan2018-10-222-4/+6