aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #36472 from kamipo/empty_line_only_before_access_modifierRyuta Kamizono2019-06-1344-50/+0
|\ | | | | Enable `Layout/EmptyLinesAroundAccessModifier` cop
| * Enable `Layout/EmptyLinesAroundAccessModifier` copRyuta Kamizono2019-06-1344-50/+0
| | | | | | | | | | | | | | | | | | | | | | We sometimes say "✂️ newline after `private`" in a code review (e.g. https://github.com/rails/rails/pull/18546#discussion_r23188776, https://github.com/rails/rails/pull/34832#discussion_r244847195). Now `Layout/EmptyLinesAroundAccessModifier` cop have new enforced style `EnforcedStyle: only_before` (https://github.com/rubocop-hq/rubocop/pull/7059). That cop and enforced style will reduce the our code review cost.
* | Don't `drop_table` before schema cache testsRyuta Kamizono2019-06-131-1/+2
|/ | | | Since 5cab34449, `drop_table` clears schema cache.
* Convert the db:abort_if_pending_migrations task to be multi-DB awareMark Lee2019-06-101-0/+26
|
* Remove redundant blank line at the bottom of the generated controller testyuuji.yaginuma2019-06-071-1/+1
|
* Merge pull request #36416 from freeletics/fix-db-prepareEileen M. Uchitelle2019-06-052-12/+50
|\ | | | | Fixed db:prepare task for multiple databases.
| * Fixed db:prepare task for multiple databases.Wojciech Wnętrzak2019-06-052-12/+50
| | | | | | | | | | When one database existed already, but not the other, during setup of missing one, existing database was wiped out.
* | Merge pull request #36394 from eileencodes/treat-application-record-as-primaryEileen M. Uchitelle2019-06-051-3/+3
|\ \ | |/ |/| Treat ActiveRecord::Base and ApplicationRecord as "primary"
| * Treat ActiveRecord::Base and ApplicationRecord as "primary"eileencodes2019-06-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When someone has a multi-db application their `ApplicationRecord` will look like: ```ruby class ApplicationRecord < ActiveRecord::Base self.abstract_class = true connects_to database: { writing: :primary, reading: :replica } end ``` This will cause us to open 2 connections to ActiveRecord::Base's database when we actually only want 1. This is because Rails sees `ApplicationRecord` and thinks it's a new connection, not the existing `ActiveRecord::Base` connection because the `connection_specification_name` is different. This PR changes `ApplicationRecord` classes to consider themselves the same as the "primary" connection. Fixes #36382
* | Extract default log file open operation to methodyuuji.yaginuma2019-06-053-10/+21
| | | | | | | | | | | | This allows customize a default log file(e.g. `reopen`) by an application. Fixes #32211.
* | Fix rubocop violationyuuji.yaginuma2019-06-051-2/+1
|/
* Merge pull request #36395 from cpruitt/6-0-stableEileen M. Uchitelle2019-06-041-3/+9
| | | Do not clear deprecated initializer dependencies if using classic autoloader
* Fail parallel tests if workers exit earlyJohn Hawthorn2019-05-301-0/+18
| | | | | | | | | | | | | | | | Previously, if a test worker exited early, the in-flight test it was supposed to run wasn't reported as a failure. If all workers exited immediately, this would be reported as ex. Finished in 1.708349s, 39.2192 runs/s, 79.0237 assertions/s. 67 runs, 135 assertions, 0 failures, 0 errors, 2 skips This commit validates that all workers finish running tests by ensuring that the queue is empty after they exit. This works because we signal the workers to exit by pushing nil onto the queue, so that there should be a number of items left in the queue matching potentially missed tests.
* Bring `after_bundle` back to API document [ci skip]yuuji.yaginuma2019-05-291-1/+6
| | | | | At class level `:nodoc:` all elements are prevented. Instead, use `:stopdoc:` / `:startdoc:` to make `after_bundle` appear.
* Skip needless spaces from generated app layout.Kasper Timm Hansen2019-05-261-1/+1
|
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 03:27:35 +0000