aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | Bump Gemfile entry jbuilder versionAnton Rieder2019-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | jbuilder 2.6.4 is the first version that relaxes the version constraint to allow Rails 6. I also did some more tests in #25183, although not with 2.6.4 explicitly. To simplify the version requirement, I went for 2.7. https://github.com/rails/jbuilder/blob/v2.6.4/jbuilder.gemspec https://github.com/rails/rails/issues/25183#issuecomment-494342406
* | Fix: DummyCompiler embeds invalid YAML contentVishal Telangre2019-05-152-8/+19
| | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/36285. Follow up of https://github.com/rails/rails/pull/36237.
* | Merge pull request #36237 from eileencodes/fix-erb-in-database-yaml-againEileen M. Uchitelle2019-05-142-1/+22
|\ \ | | | | | | Fix database loading when ERB is single line ternary
| * | Fix database loading when ERB is single line ternaryeileencodes2019-05-102-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *sigh* this seems like the never ending bug. I don't love or even like this fix but it does _work_. Rafael suggested using `dummy_key: dummy_value` but unfortunately that doesn't work. So we're left with checking whethere there might be ternary type things in the content and then assuming that we want to replace the line with a key value pair. Technically fixes https://github.com/rails/rails/issues/36088
* | | Add ActionDispatch::SystemTestCase#fill_in_rich_text_areaGeorge Claghorn2019-05-131-1/+1
| | |
* | | adds a blank line [ci skip]Xavier Noria2019-05-131-0/+1
| | |
* | | warn about non-eager loaded dirs in zeitwerk:checkXavier Noria2019-05-131-19/+53
| | |
* | | Update the sqlite db yaml template to match others and mention proper ↵Vipul A M2019-05-122-2/+2
| | | | | | | | | | | | supported version
* | | Merge branch 'migration-timestamp-fix'Gannon McGibbon2019-05-101-0/+15
|\ \ \ | | | | | | | | | | | | Closes #28707.
| * | | Add class option timestamps to migration generatorMichael Duchemin2019-02-091-0/+15
| | | | | | | | | | | | | | | | Fixes GH#28706. Now rails g migration create_users and rails g model User have the same behavior for timestamps since they implement the same migration template. The expected behavior is that this create table migration will create the table with timestamps unless you pass --no-timestamps or --skip-timestamps to the generator. The expected migration should match what you get when you use the model generator. Using the migration generator, which doesn't have a class_option for timestamps would cause them to not be added to the migration file. Now the migration behavior of the migration generator, create_table only, is aligned with the migration behavior of the model generator. Also modified relevant example of ActiveRecord Migrations Guide.
* | | | Merge pull request #36225 from ↵Yuji Yaginuma2019-05-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | deivid-rodriguez/workaround_sass_rails_requirement Use a better requirement for sass-rails 6 prereleases
| * | | | Use a better requirement for sass-rails 6 prereleasesDavid Rodríguez2019-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the behavior I naively expect for the operator when used with a single digit, but it's definitely an edge case for it, and it doesn't seem to work as expected for including prereleases. Using >= works fine and make the intention more clear anyways.
* | | | | Fix indentation of the config.eager_load nil warningSharang Dashputre2019-05-091-1/+1
|/ / / /
* | / / Fix indentation for config.eager_load nil warning messageAbhay Nikam2019-05-081-5/+5
| |/ / |/| |
* | | Merge pull request #36196 from st0012/fix-29947Eileen M. Uchitelle2019-05-071-0/+16
| | | | | | | | | | | | | | | | | | | | | Hide malformed parameters from error page Accidentally merged this to 6-0-stable so forward porting it to master here instead.
* | | Make generated test work even when using virtual attributesyuuji.yaginuma2019-05-056-7/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | The virtual attributes(`attachment` and `rich_text`) can't set value with `fill_in`. So avoid using it. Once #35885 is merged, will be modified to use it. Also, add checking attachment attached or not for avoiding `DelegationError` when attachment didn't attach.
* | | Fix rubocop offencesRyuta Kamizono2019-04-301-1/+1
| | |
* | | new config to opt-out from adding app directories to $LOAD_PATHXavier Noria2019-04-283-6/+38
| | |
* | | Fallback to spawn instead of fork in jruby (#36111)Guilherme Mansur2019-04-261-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | * Fallback to spawn instead of fork in jruby This commit: b342db6 introduced a `fork` fork when running the railties tests since this is not supported in jruby we fallback to using spawn. Fixes: https://github.com/rails/rails/issues/35900
* | | Bump bootsnap to a version with disables iseq_cache for Ruby 2.5Prathamesh Sonpatki2019-04-261-1/+1
| | | | | | | | | | | | - Refs https://github.com/Shopify/bootsnap/pull/257
* | | Start Rails 6.1 developmentRafael Mendonça França2019-04-243-403/+5
| | |
* | | Merge pull request #36067 from st0012/update-generator-for-api-appRafael França2019-04-233-0/+11
|\ \ \ | | | | | | | | Remove action_controller.perform_caching from api app's configs
| * | | Remove action_controller.perform_caching from api app's configsst00122019-04-243-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested in https://github.com/rails/rails/issues/35602#issuecomment-485833483, because we don't provide view caching and doesn't include `ActionController::Caching` for api apps, we should also avoid generating ```ruby config.action_controller.perform_caching = true ``` for those api apps. So it won't confuse people. **But because `perform_caching` will be `true` if not set, the behavior of the app would still be the same without these configs.**
* | | | Merge pull request #35852 from larouxn/resurrectionRafael França2019-04-232-0/+9
|\ \ \ \ | |/ / / |/| | | Resurrect external JS/CS generation
| * | | Burn unnecessary files 🔥Nicholas La Roux2019-04-053-19/+0
| | | |
| * | | Style fixesNicholas La Roux2019-04-051-3/+3
| | | |
| * | | Resurrect generator templatesNicholas La Roux2019-04-052-0/+4
| | | |
| * | | Resurrect js/js engine options and generatorsNicholas La Roux2019-04-053-0/+24
| | | |
* | | | Implements the task zeitwerk:checkXavier Noria2019-04-233-0/+90
| | | | | | | | | | | | | | | | [Matilda Smeds & Xavier Noria]
* | | | upgrades Zeitwerk to 2.1.4Xavier Noria2019-04-231-51/+21
| | | | | | | | | | | | | | | | | | | | | | | | This commit more or less undoes 9b5401f, restores autoloaded? not to touch the descendants tracker, and autoloaded_constants because it is documented in the guide.
* | | | Revert "Include Caching module for ActionController::API"Rafael França2019-04-221-13/+0
| | | |
* | | | Merge pull request #36038 from st0012/fix-35602Guillermo Iguaran2019-04-221-0/+13
|\ \ \ \ | | | | | | | | | | Include Caching module for ActionController::API
| * | | | Make sure api controllers can perform caching as wellst00122019-04-191-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently ActionController::API doesn't include Caching module, so it can't perform caching. And even if users include it later manually, it won't inherit application's default cache store for action_controllers. So the only way to solve this issue is to include Caching module in ActionController::API, too. This closes #35602
* | | | | Allow sass-rails greater than 5.x in new appsGuillermo Iguaran2019-04-221-1/+1
| | | | |
* | | | | Make system tests take failed screenshots in `before_teardown` hookRichard Macklin2019-04-201-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were calling the `take_failed_screenshot` method in an `after_teardown` hook. However, this means that other teardown hooks have to be executed before we take the screenshot. Since there can be dynamic updates to the page after the assertion fails and before we take a screenshot, it seems desirable to minimize that gap as much as possible. Taking the screenshot in a `before_teardown` rather than an `after_teardown` helps with that, and has a side benefit of allowing us to remove the nested `ensure` commented on here: https://github.com/rails/rails/pull/34411#discussion_r232819478
* | | | | Merge pull request #35896 from jlw/bug/active-jobless-seedsGannon McGibbon2019-04-203-1/+37
|\ \ \ \ \ | | | | | | | | | | | | [#35782] Allow loading seeds without ActiveJob (~> 5.2.3)
| * | | | | [#35782] Allow loading seeds without ActiveJob (~> 5.2.3)Jeremy Weathers2019-04-193-1/+37
| | | | | |
* | | | | | Remove duplicated testyuuji.yaginuma2019-04-201-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With 8b4d344815655027d9f7584c0a59271dce8f1d5a, `test_required_polymorphic_belongs_to_generates_correct_model` and `test_required_and_polymorphic_are_order_independent` are completely same. Also, remove `required` from test name because that not passed to generator.
* | | | | | Handle up/down for multiple databaseseileencodes2019-04-191-1/+58
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the ability to run up/down for a database in a multi-db environment. If you have an app with a primary and animals database the following tasks will be generated: ``` VERSION=123 rake db:migrate:up:primary VERSION=123 rake db:migrate:up:primary VERSION=123 rake db:migrate:down:primary VERSION=123 rake db:migrate:up:animals ``` I didn't generate descriptions with them since we don't generate a description for a single database application. In addition to this change I've made it so if your application has multiple databases Rails will raise if you try to run `up` or `down` without a namespace. This is because we don't know which DB you want to run `up` or `down` against unless the app tells us, so it's safer to just block it and recommend using namespaced versions of up/down respectively. The output for the raise looks like: ``` You're using a multiple database application. To use `db:migrate:down` you must run the namespaced task with a VERSION. Available tasks are db:migrate:down:primary and db:migrate:down:animals. ```
* | | | | Add `null: false` constraint by default for `belongs_to` associationsPrathamesh Sonpatki2019-04-195-9/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also deprecate passing {required} to the model generator. - Also made sure the global config `belongs_to_required_by_default` is applied correctly to the model generator for `null: false` option.
* | | | | Merge pull request #34788 from gsamokovarov/actionable-errorsKasper Timm Hansen2019-04-192-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Introduce Actionable Errors
| * | | | | Manage ActionDispatch::ActionableExceptions from the default middleware stackGenadi Samokovarov2019-04-192-0/+3
| |/ / / /
* / / / / Help command for visible commands should be hiddenakinomaeni2019-04-191-2/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` $ rails --help > tmp/before $ bundle update rails ... $ rails --help > tmp/after $ diff -u tmp/before tmp/after --- tmp/before 2019-04-19 00:12:08.000000000 -0700 +++ tmp/after 2019-04-19 00:14:55.000000000 -0700 @@ -52,7 +52,6 @@ db:version destroy dev:cache - dev:help encrypted:edit encrypted:show initializers ```
* | | | Fix typo in test description from generages -> generatesAbhay Nikam2019-04-171-1/+1
| | | |
* | | | Only retry tests on CIKasper Timm Hansen2019-04-171-1/+3
| | | |
* | | | Fix bin/update references after 8927eba83cKasper Timm Hansen2019-04-173-10/+1
| | | |
* | | | Factorize bin/update in bin/setup, and make bin/setup idempotentDavid Stosik2019-04-173-50/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `bin/setup` and `bin/update` are currently almost the same file. The only thing that keeps them apart is that one is running `bin/rails db:setup` and the other `bin/rails db:migrate`. I'm suggesting here that they should be a unique script, which needs to be idempotent. - New to a project, need to get started? `bin/setup` - Need to install new dependencies that were added recently? `bin/setup`. Before deprecating `bin/update`, I'm suggesting we just have it call `bin/setup`.
* | | | Add collection cache versioningLachlan Sylvester2019-04-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache versioning enables the same cache key to be reused when the object being cached changes by moving the volatile part of the cache key out of the cache key and into a version that is embedded in the cache entry. This is already occurring when the object being cached is an `ActiveRecord::Base`, but when caching an `ActiveRecord::Relation` we are currently still putting the volatile information (max updated at and count) as part of the cache key. This PR moves the volatile part of the relations `cache_key` into the `cache_version` to support recycling cache keys for `ActiveRecord::Relation`s.
* | | | Merge pull request #35997 from ↵Rafael França2019-04-162-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | tjoyal/Rails/MailersController/do-not-leak-I18n-global-setting-changes [Rails::MailersController] Do not leak I18n global setting changes
| * | | | [Rails::MailersController] Do not leak I18n global setting changesThierry Joyal2019-04-162-2/+12
| | | | |