aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in method nameyuuji.yaginuma2017-07-111-1/+1
|
* Merge pull request #29742 from lugray/default_protect_from_forgeryRafael França2017-07-105-4/+16
|\ | | | | Default protect from forgery
| * Protect from forgery by defaultLisa Ugray2017-07-105-4/+16
| | | | | | | | | | | | | | | | Rather than protecting from forgery in the generated ApplicationController, add it to ActionController::Base by config. This configuration defaults to false to support older versions which have removed it from their ApplicationController, but is set to true for Rails 5.2.
* | * Don't eagerly require Rails' minitest plugin.Kasper Timm Hansen2017-07-1012-267/+244
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | By making the Rails minitest behave like a standard minitest plugin we're much more likely to not break when people use other minitest plugins. Like minitest-focus and pride. To do this, we need to behave like minitest: require files up front and then perform the plugin behavior via the at_exit hook. This also saves us a fair bit of wrangling with test file loading. Finally, since the environment and warnings options have to be applied as early as possible, and since minitest loads plugins at_exit, they have to be moved to the test command. * Don't expect the root method. It's likely this worked because we eagerly loaded the Rails minitest plugin and that somehow defined a root method on `Rails`. * Assign a backtrace to failed exceptions. Otherwise Minitest pukes when attempting to filter the backtrace (which Rails' backtrace cleaner then removes). Means the exception message test has to be revised too. This is likely caused by the rails minitest plugin now being loaded for these tests and assigning a default backtrace cleaner.
* Merge pull request #29721 from y-yagi/fix_29696Kasper Timm Hansen2017-07-092-2/+36
|\ | | | | Treat secrets as binary
| * Treat secrets as binaryyuuji.yaginuma2017-07-092-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until Rails 5.1.1 secrets was treated as binary inside Rails. https://github.com/rails/rails/blob/v5.1.1/railties/lib/rails/secrets.rb#L59 https://github.com/rails/rails/blob/v5.1.1/railties/lib/rails/secrets.rb#L63 However, it is treated as String in Rails 5.1.2(changed by 157db872103429e8782b62d1cb5d1d91337177a7). https://github.com/rails/rails/blob/v5.1.2/railties/lib/rails/secrets.rb#L104 https://github.com/rails/rails/blob/v5.1.2/railties/lib/rails/secrets.rb#L108 As a result, when upgrading from Rails 5.1.1 to 5.1.2, to write the value treated as binary using `File.write`, causing an error. In order to avoid `UndefinedConversionError`, fixed it to treat it as binary like 5.1.1. Fixes #29696
* | Load environment file in `dbconsole` commandyuuji.yaginuma2017-07-093-0/+73
|/ | | | | | | | | Currently the environment file is not loaded in `dbconsole` command. Therefore, for example, if use encrypted secrets values in database.yml, `read_encrypted_secrets` will not be true, so the value can not be used correctly. Fixes #29717
* Merge pull request #29695 from y-yagi/secrets_showMatthew Draper2017-07-094-1/+22
|\ | | | | Add `rails secrets:show` command
| * Add `rails secrets:show` commandyuuji.yaginuma2017-07-074-1/+22
| | | | | | | | | | | | | | | | | | | | | | When secrets confirmed with the `secrets:edit` command, `secrets.yml.enc` will change without updating the secrets. Therefore, even if only want to check secrets, the difference will come out. This is a little inconvenient. In order to solve this problem, added the `secrets:show` command. If just want to check secrets, no difference will occur use this command.
* | Merge pull request #29705 from y-yagi/do_not_update_secrets_yml_encMatthew Draper2017-07-092-1/+21
|\ \ | | | | | | Do not update `secrets.yml.enc` when secretes do not change
| * | Do not update `secrets.yml.enc` when secretes do not changeyuuji.yaginuma2017-07-072-1/+21
| |/ | | | | | | | | | | | | | | | | | | | | Currently, if open a file with `secrets:edit` command, `secrets.yml.enc` will be changed even if its contents do not change. Therefore, even if only want to check secrets, the difference will come out. This is a little inconvenient. As a fix to the above problem, when content does not change, `secrets.yml.ecn` is fixed so that it is not changed.
* / Update default app files in app_generator_testKoichi ITO2017-07-061-2/+40
|/
* Allow mounting same engine under several locationsDavid Rodríguez2017-07-052-0/+92
|
* Merge pull request #29677 from eugeneius/parameters_configuration_testsRafael Mendonça França2017-07-051-0/+36
|\ | | | | | | Fix Parameters configuration integration tests
| * Fix Parameters configuration integration testsEugene Kenny2017-07-041-0/+41
| | | | | | | | | | | | | | | | | | These tests relied on `ActionController::Parameters` being configured as part of the boot process; since that now happens lazily we need to force `ActionController::Base` to load so that we can test the behaviour. The new tests added here ensure that `ActionController::Parameters` can be configured from an initializer, which was broken until recently.
* | Force ActionController::Base lazy laod hooks to runRafael Mendonça França2017-07-051-0/+12
|/ | | | | | | Now that the parameters configurations are only loaded when ActionController::Base is we need to foce them to load in our tests. In an application this is not needed since every request already load the controllers.
* Add backticks [ci skip]Ryuta Kamizono2017-07-031-1/+1
|
* Merge branch 'master' into require_relative_2017Xavier Noria2017-07-026-12/+61
|\
| * Remove redundant `assert_respond_to`Ryuta Kamizono2017-07-031-3/+0
| | | | | | | | It is covered by following assertion.
| * Move test related to `tmp:clear` task to `tmp_test.rb`yuuji.yaginuma2017-07-022-7/+7
| |
| * Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-02253-253/+0
| | | | | | | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
| * Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-02253-0/+253
| |\ | | | | | | | | | Enforce frozen string in Rubocop
| | * Enforce frozen string in RubocopKir Shatrov2017-07-01252-0/+252
| | |
| * | Merge pull request #29534 from y-yagi/clear_screenshots_in_tmp_clear_taskEileen M. Uchitelle2017-07-013-2/+49
| |\ \ | | | | | | | | Clear screenshots files in `tmp:clear` task
| | * | Clear screenshots files in `tmp:clear` taskyuuji.yaginuma2017-06-273-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If system test fails, it creates screenshot under `tmp/screenshots`. https://github.com/rails/rails/blob/34fe2a4fc778d18b7fe6bdf3629c1481bee789b9/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb#L45 But currently, screenshot files is not cleared by `tmp:clear` task. This patch make clears screenshot files with `tmp:clear` task as well as other tmp files.
| * | | Add source code and changelog link to railties.gemspecKoichi ITO2017-07-011-0/+5
| | | |
* | | | [Railties] require => require_relativeAkira Matsuda2017-07-0171-107/+107
|/ / /
* | | Merge pull request #29418 from dinahshi/scaffold_system_testsEileen M. Uchitelle2017-06-307-13/+104
|\ \ \ | |_|/ |/| | Add system tests to generate scaffold
| * | Add system tests to generate scaffoldDinah Shi2017-06-307-13/+104
| | |
* | | Ignore public/assetsamingilani2017-06-271-0/+4
| |/ |/|
* | Merge pull request #29560 from fatkodima/remove_unnecessary_tap_callRafael França2017-06-261-1/+1
|\ \ | | | | | | Remove unnecessary `tap` call on `ActionDispatch::MiddlewareStack.new`
| * | Remove unnecessary `tap` call on `ActionDispatch::MiddlewareStack` instancefatkodima2017-06-241-1/+1
| | |
* | | Add `railtie.rb` to the plugin generatorTsukuru Tanimichi2017-06-265-2/+20
|/ /
* | Deprecate an `capify!` method in generators and templatesyuuji.yaginuma2017-06-183-2/+10
| | | | | | | | | | | | | | | | | | The `capify` command has been removed by Capistrano 3 and became to `cap install`. Therefore, the `capify!` method has no meaning in Capistrano 3. I think that should deprecate. Ref: https://github.com/capistrano/capistrano/commit/492793916acf32ffe1604daec6fd4892c8935018
* | Add the `<app_root>/test` dir to the `$LOAD_PATH` as a string:Edouard CHIN2017-06-161-1/+1
| | | | | | | | - [Rails <= 5.0](https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/commands/test.rb#L6) used to add the `<app_root>/test` as a string; this behaviour changed in rails 5.1, it's appending a `Pathname` object
* | Use `require_relative` instead of `require` with full pathbogdanvlviv2017-06-145-7/+7
| |
* | Merge pull request #29289 from vergenzt/patch-1Vipul A M2017-06-121-0/+3
|\ \ | | | | | | Add note to Railtie docs to use unique filenames
| * | Add note to Railtie docs to use unique filenamesTim Vergenz2017-06-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The fact that the names need to be globally unique was not obvious to me, so I thought it'd be worth documenting. This not being clear was the cause of both ctran/annotate_models#468 and instructure/outrigger#1. [ci skip]
* | | Merge pull request #29425 from gsamokovarov/drop-the-irb-termGuillermo Iguaran2017-06-121-1/+1
|\ \ \ | | | | | | | | Drop IRB out of the web-console Gemfile comment
| * | | Drop IRB out of the web-console Gemfile commentGenadi Samokovarov2017-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't provide exactly the same experience as IRB does, so let's not advertize it like that. We can say that it's an interactive console, without further references. I have also followed byebug's comment and changed the calling `console` part. Hopefully, this can hint that the invocation is not view specific and you can use it like the debugger statement. [ci skip]
* | | | Merge pull request #29263 from assain/default_message_encryptor_to_gcmKasper Timm Hansen2017-06-112-0/+8
|\ \ \ \ | |/ / / |/| | | Default Message Encryptor Cipher to AES-256-GCM From AES-256-CBC
| * | | set message_encryptor default cipher to aes-256-gcmAssain2017-06-122-0/+8
| | | | | | | | | | | | | | | | - Introduce a method to select default cipher, and maintain backward compatibility
* | | | Access EDITOR through Ruby's cross-platform ENV.Kasper Timm Hansen2017-06-111-2/+2
| |_|/ |/| | | | | | | | | | | Fix the mistake of not using Ruby's ENV hash from the get go and get windows support.
* | | Make i18n test match the description of the testGuillermo Iguaran2017-06-091-1/+1
| | |
* | | Ensure MSSQL password uses real ENV var.Ken Collins2017-06-051-2/+2
|/ /
* | Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-032-3/+4
| |
* | Make Rails welcome page responsiveLucas Caton2017-06-031-4/+14
| |
* | Merge pull request #29079 from ↵Eileen M. Uchitelle2017-06-021-1/+1
|\ \ | | | | | | | | | | | | orhantoy/feature/fix-scaffold_controller-generator-usage [ci skip] Fix `scaffold_controller` generator usage
| * | [ci skip] Fix `scaffold_controller` generator usageOrhan Toy2017-05-291-1/+1
| | |
* | | Remove the pathname dependency from bin/update and bin/setupBen Woosley2017-05-312-4/+2
| | | | | | | | | | | | We don't get any benefit from it at all.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 06:44:02 +0000