aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31750 from morygonzalez/consider-locale_selector-missingYuji Yaginuma2018-01-231-5/+16
|\ | | | | Fix locale_selector JS bug in ActionMailer Preview
| * Fix locale_selector JS bug in ActionMailer PreviewHitoshi Nakashima2018-01-231-5/+16
| |
* | bin/yarn: Pass through arguments with spacesJake Teton-Landis2018-01-211-1/+1
|/ | | | | | Previously, the `bin/yarn` wrapper would "unquote" arguments to yarn like this: `yarn run add-copyright "(c) 2017, 2018 MyCompany"` That results in an ARGV of ['run', 'add-copyright', '(c) 2017, 2018 MyCompany'] in the yarn wrapper, but a ARGV in the yarn executable of ['run', 'add-copyright', '(c)', '2017,', '2018', MyCompany']
* Merge pull request #31641 from ckoenig/remove_frozen_string_literalYuji Yaginuma2018-01-201-4/+6
|\ | | | | Use dup'ed options hash
| * Work on a dup'ed options hashChristof Koenig2018-01-091-4/+6
| | | | | | | | | | | | | | | | | | | | Otherwise, at least using JRuby, the replacements in convert_database_option_for_jruby won't work. Thus a call to bundle exec rails app:update fails. Simply replacing those replace statements doesn't seem to work either, since the options hash seems to be frozen, too.
* | Merge pull request #31732 from ↵Matthew Draper2018-01-191-2/+2
|\ \ | | | | | | | | | | | | koic/enable_autocorrect_for_lint_end_alignment_cop Enable autocorrect for `Lint/EndAlignment` cop
| * | Enable autocorrect for `Lint/EndAlignment` copKoichi ITO2018-01-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ### Summary This PR changes .rubocop.yml. Regarding the code using `if ... else ... end`, I think the coding style that Rails expects is as follows. ```ruby var = if cond a else b end ``` However, the current .rubocop.yml setting does not offense for the following code. ```ruby var = if cond a else b end ``` I think that the above code expects offense to be warned. Moreover, the layout by autocorrect is unnatural. ```ruby var = if cond a else b end ``` This PR adds a setting to .rubocop.yml to make an offense warning and autocorrect as expected by the coding style. And this change also fixes `case ... when ... end` together. Also this PR itself is an example that arranges the layout using `rubocop -a`. ### Other Information Autocorrect of `Lint/EndAlignment` cop is `false` by default. https://github.com/bbatsov/rubocop/blob/v0.51.0/config/default.yml#L1443 This PR changes this value to `true`. Also this PR has changed it together as it is necessary to enable `Layout/ElseAlignment` cop to make this behavior.
* | | Add locale selector to email preview (#31596)Hitoshi Nakashima2018-01-183-18/+97
| | | | | | | | | | | | - Add set_locale to detect suitable locale - Make feature compatible with Rails 5.x
* | | Merge pull request #31730 from ↵Eileen M. Uchitelle2018-01-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | bogdanvlviv/allow_false_for-config-generators-system_tests Allow `false` for `config.generators.system_tests=`
| * | | Allow `false` for `config.generators.system_tests=`bogdanvlviv2018-01-181-1/+1
| |/ / | | | | | | | | | | | | Mention `config.generators.system_tests` in the "Configuring Rails Applications" guide.
* | | Add test to properly test down with a blockeileencodes2018-01-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | down is only called with a block from the rake tasks where it passes a `SCOPE`. Technically this was tested but since we don't run all the migrations we're not actually testing the down works with a `SCOPE`. To ensure we're testing both we can run `db:migrate` again to migrate users and then run `down` with a scope to test that only the bukkits migration is reverted. Updates test to prevent having to fix regressions like we did in 4d4db4c.
* | | Revert "Merge pull request #31434 from olivierlacan/boot-feedback"Matthew Draper2018-01-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit edc54fd2068bc21f0d381228e55d97e32f508923, reversing changes made to a5922f132f4d163e2c7f770427087f5268c18def. As discussed, this is not an appropriate place to make assumptions about ARGV, or to write to stdout: config/boot.rb is a library and is required by other applictions, with which we have no right to interfere.
* | | Refactor migration to move migrations paths to connectioneileencodes2018-01-183-2/+14
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails has some support for multiple databases but it can be hard to handle migrations with those. The easiest way to implement multiple databases is to contain migrations into their own folder ("db/migrate" for the primary db and "db/seconddb_migrate" for the second db). Without this you would need to write code that allowed you to switch connections in migrations. I can tell you from experience that is not a fun way to implement multiple databases. This refactoring is a pre-requisite for implementing other features related to parallel testing and improved handling for multiple databases. The refactoring here moves the class methods from the `Migrator` class into it's own new class `MigrationContext`. The goal was to move the `migrations_paths` method off of the `Migrator` class and onto the connection. This allows users to do the following in their `database.yml`: ``` development: adapter: mysql2 username: root password: development_seconddb: adapter: mysql2 username: root password: migrations_paths: "db/second_db_migrate" ``` Migrations for the `seconddb` can now be store in the `db/second_db_migrate` directory. Migrations for the primary database are stored in `db/migrate`". The refactoring here drastically reduces the internal API for migrations since we don't need to pass `migrations_paths` around to every single method. Additionally this change does not require any Rails applications to make changes unless they want to use the new public API. All of the class methods from the `Migrator` class were `nodoc`'d except for the `migrations_paths` and `migrations_path` getter/setters respectively.
* | Provide a sensible default hostGeorge Claghorn2018-01-161-2/+0
| |
* | Extract content types from blob dataGeorge Claghorn2018-01-151-0/+2
| |
* | Merge pull request #31572 from kami-zh/fix-templateYuji Yaginuma2018-01-131-2/+3
|\ \ | | | | | | Fix comment about initializers to adapt to the fact
| * | Fix comment about initializers to adapt to the factkami-zh2017-12-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the comment says application configuration should go into files in `config/initializers`. However some configuration couldn't initialize correctly because of the initializing process(e.g. `config.time_zone`). It should be changed by framework but this is large change and it may occur malfunction to some applications which depends on current initializing process. So this comment is changed to adapt to the fact.
* | | Merge pull request #31651 from eugeneius/use_sha1_digestsSean Griffin2018-01-124-7/+19
|\ \ \ | | | | | | | | Use SHA-1 for non-sensitive digests by default
| * | | Use SHA-1 for non-sensitive digests by defaultEugene Kenny2018-01-084-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | Instead of providing a configuration option to set the hash function, switch to SHA-1 for new apps and allow upgrading apps to opt in later via `new_framework_defaults_5_2.rb`.
* | | | Use unsafe_inline as the default for script_src CSP until we get a nonce ↵David Heinemeier Hansson2018-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | alternative Closes #31273 but we will still want to upgrade this to the nonce-approach when it’s ready.
* | | | Add note about having to restart when modifying initializerDavid Heinemeier Hansson2018-01-121-0/+2
| | | |
* | | | Use complete variable names rather than single-letter abbreviations for styleDavid Heinemeier Hansson2018-01-121-8/+8
| | | |
* | | | Merge pull request #31671 from larskanis/pg-1.0Rafael Mendonça França2018-01-112-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecord
| * | | | PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecordLars Kanis2018-01-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pg-1.0.0 is just released and most Gemfiles don't restrict it's version. But the version is checked when connecting to the database, which leads to the following error: Gem::LoadError: can't activate pg (~> 0.18), already activated pg-1.0.0 See also this pg issue: https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start Preparation for pg-1.0 was done in commit f28a331023fab, but the pg version constraint was not yet relaxed.
* | | | | Merge pull request #31624 from y-yagi/fix_minitest_511Aaron Patterson2018-01-102-6/+12
|\ \ \ \ \ | |/ / / / |/| | | | Add support for Minitest 5.11
| * | | | Need to use `klass` to get the class name of the test resultyuuji.yaginuma2018-01-032-6/+6
| | | | | | | | | | | | | | | | | | | | Ref: http://docs.seattlerb.org/minitest/Minitest/Result.html#attribute-i-klass
| * | | | Correctly get source locationyuuji.yaginuma2018-01-032-1/+7
| | |_|/ | |/| | | | | | | | | | | | | | `filtered_results` returns an instance of `Minitest::Result` since https://github.com/seattlerb/minitest/commit/00433fc0a4fdd0e6b302aace633384ba13122376 `Minitest::Result` is not test class. So cannot get location directly.
* | | | Clean up railties testsbogdanvlviv2018-01-102-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `AppGeneratorTest#test_active_storage_install`. The test is added by 67db41aa7f17c2d34eb5a914ac7a6b2574930ff4, since #31534 this test doesn't test anything. Remove redundant assertions in `SharedGeneratorTests`. These assertions is added by 4a835aa3236eedb135ccf8b59ed3c03e040b8b01. Follows 67db41aa7f17c2d34eb5a914ac7a6b2574930ff4, #31534.
* | | | Merge pull request #31534 from claudiob/kaspth-approachKasper Timm Hansen2018-01-093-13/+2
|\ \ \ \ | |_|/ / |/| | | Don't include Active Storage migrations in new apps
| * | | Don't run rails active_storage:install in new appsclaudiob2017-12-143-13/+2
| | | | | | | | | | | | | | | | See #31315 for full discussion
* | | | Allow use_authenticated_message_encryption to be set in ↵Eugene Kenny2018-01-071-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new_framework_defaults_5_2.rb Enabling this option in new_framework_defaults_5_2.rb didn't work before, as railtie initializers run before application initializers. Using `respond_to?` to decide whether to set the option wasn't working either, as `ActiveSupport::OrderedOptions` responds to any message.
* | | | Improve the deprecation message for using subclass of Rails::Application to ↵Prathamesh Sonpatki2018-01-073-3/+3
| |/ / |/| | | | | | | | start the Rails server
* | | Bump license years for 2018Yoshiyuki Hirano2017-12-311-1/+1
| | |
* | | Clarify that config.eager_load controls eager loading [ci skip]Eugene Kenny2017-12-302-2/+2
| | | | | | | | | | | | | | | | | | | | | Before Rails 4.0, `config.cache_classes` determined whether application code was eager loaded. The `config.eager_load` option was introduced to allow the two behaviours to be configured independently, but this documentation was never updated to reflect that change.
* | | Remove unused methodsyuuji.yaginuma2017-12-281-16/+0
| |/ |/| | | | | | | * `assert_header` and `assert_body` were unused since 6f6a589. * `assert_success` and `assert_missing` were unused since added.
* | Prevent to install gems when run test (#31564)Yuji Yaginuma2017-12-262-4/+12
| | | | | | | | | | | | `invoke_all` cause `bundle install`. This will install gems actually defined in `Gemfile`. To avoid this, stubbed `bundle_command`. Fixes #31557
* | Ensure to use repo's Gemfile in applicationyuuji.yaginuma2017-12-251-0/+5
| | | | | | | | | | | | | | | | | | Puma gets bundler's info from `Bundler::ORIGINAL_ENV` for restart. https://github.com/puma/puma/blob/f6f3892f4d82638fb7a2a57d993641b1486ee88a/lib/puma/launcher.rb#L168 So, specified `BUNDLE_GEMFILE` env for use same Gemfile in the restart. Fixes #31351
* | Move `test_skip_bundle` to `AppGeneratorTest`yuuji.yaginuma2017-12-242-9/+9
| | | | | | | | `skip_bundle` option was removed from plugin generator in 9b72fcc3c22a6f75f37f52dd6cb682bc00c51cf0.
* | Removes OS specific directory separatorDaniel Lopez2017-12-211-1/+1
| |
* | Merge pull request #31520 from yahonda/introduce_frozen_error_classRyuta Kamizono2017-12-202-1/+5
|\ \ | | | | | | Handle `FrozenError` if it is available
| * | Handle `FrozenError` if it is availableYasuo Honda2017-12-202-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pull request handles `FrozenError` introduced by Ruby 2.5. Refer https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/61131 Since `FrozenError` is a subclass of `RuntimeError` minitest used by master branch can handle it, though it would be better to handle `FrozenError` explicitly if possible. `FrozenError` does not exist in Ruby 2.4 or lower, `frozen_error_class` handles which exception is expected to be raised. This pull request is intended to be merged to master, then backported to `5-1-stable` to address #31508
* | | Add test case that configure `config.active_support.hash_digest_class`yuuji.yaginuma2017-12-201-0/+18
| | | | | | | | | | | | Follow up of #31289.
* | | Remove verbose_query_logs from new_framework_defaults_5_2.rbEugene Kenny2017-12-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `app:update` rake task will regenerate `development.rb` so that it contains this option; that means we're currently adding it to existing apps in two places, which is unnecessary and confusing. Also: - Remove inaccurate comment about which stack frames are ignored - Clarify that the feature uses `caller_locations`, not `caller` - Remove unused return value in `extract_callstack`
* | | Implicitly skip bootsnap for `rails new --dev`yuuji.yaginuma2017-12-192-1/+12
|/ / | | | | | | | | | | | | Specifying the `--dev` option is when want to change the codebase, as it is not necessary to cache it. Context: https://github.com/rails/rails/pull/31485#issuecomment-352452653
* | Merge pull request #31348 from y-yagi/fix_31283Kasper Timm Hansen2017-12-189-16/+71
|\ \ | | | | | | Raise an error only when `require_master_key` is specified
| * | Raise an error only when `require_master_key` is specifiedyuuji.yaginuma2017-12-189-16/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent errors from being raise in environments where credentials is unnecessary. Context: https://github.com/rails/rails/issues/31283#issuecomment-348801489 Fixes #31283
* | | Update new_framework_defaults_5_2.rb.ttAnton Rieder2017-12-181-1/+1
| | | | | | | | | Be consistent in comments when mentioning AES.
* | | Merge pull request #31485 from y-yagi/skip_bootsnap_optionEileen M. Uchitelle2017-12-184-0/+31
|\ \ \ | |/ / |/| | Add `skip_bootsnap` option
| * | Add `skip_bootsnap` optionyuuji.yaginuma2017-12-164-0/+31
| |/ | | | | | | | | | | `bootsnap` is a useful gem normally. However, `bootsnap` is unnecessary when generating a Rails application to be used only for testing. So I want to control whether use this or not by option.
* / Add test case that active_storage:install task works within engineyuuji.yaginuma2017-12-171-0/+15
|/ | | | Follow up of #31391
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:40:59 +0000