aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* 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.
* | | Merge pull request #29088 from ↵Matthew Draper2017-05-311-3/+4
|\ \ \ | |_|/ |/| | | | | | | | greysteil/better-spacing-in-production-environment Better spacing in environments/production.rb file
| * | Better spacing in environments/production.rb fileGrey Baker2017-05-151-3/+4
| | | | | | | | | | | | | | | Previously there were a couple of places where double-spacing or no spacing was happening, depending on skipped options.
* | | Replace therubyracer with mini_racerSam2017-05-302-2/+2
| | |
* | | Do not use UTF8 in test SecretsCommandTest#test_edit_secretsPavel Valena2017-05-302-2/+2
| | |
* | | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-292-6/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | * Allow a default value to be declared for class_attribute * Convert to using class_attribute default rather than explicit setter * Removed instance_accessor option by mistake * False is a valid default value * Documentation
* | Doh. We are doing this on secrets:setup. Revert "Ignore the encrypted ↵David Heinemeier Hansson2017-05-291-3/+0
| | | | | | | | | | | | secrets key file that is created by rails secrets:setup" This reverts commit 75500476eb7e953a06cc64e67ecc57b13ef8cc99.
* | Merge pull request #29266 from ojiry/add-elm-option-to-generator-descEileen M. Uchitelle2017-05-291-1/+1
|\ \ | | | | | | [ci skip] Add elm option of webpack to generator description
| * | Add elm option of webpack to generator descriptionRyoji Yoshioka2017-05-291-1/+1
| | |
* | | Ignore the encrypted secrets key file that is created by rails secrets:setupDavid Heinemeier Hansson2017-05-291-0/+3
|/ /
* | Merge pull request #29208 from ↵Guillermo Iguaran2017-05-281-1/+1
|\ \ | | | | | | | | | | | | kamipo/default_env_fall_back_to_default_env_when_rails_env_or_rack_env_is_empty_string `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is an empty string
| * | `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is ↵Ryuta Kamizono2017-05-251-1/+1
| | | | | | | | | | | | | | | | | | an empty string Follow up of #27399.
* | | Merge pull request #29146 from y-yagi/fix_29138Kasper Timm Hansen2017-05-282-2/+15
|\ \ \ | | | | | | | | Correctly set user_supplied_options when there is no whitespace in option specification
| * | | Correctly set user_supplied_options when there is no whitespace in option ↵yuuji.yaginuma2017-05-242-2/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | specification Current `user_supplied_options` method can not set the value correctly if there is no space between option and value (e.g., `-p9000`). This makes it possible to set the value correctly in the case like the above. Fixes #29138