aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29695 from y-yagi/secrets_showMatthew Draper2017-07-091-0/+4
|\
| * Add `rails secrets:show` commandyuuji.yaginuma2017-07-071-0/+4
* | Do not update `secrets.yml.enc` when secretes do not changeyuuji.yaginuma2017-07-071-1/+3
|/
* Merge branch 'master' into require_relative_2017Xavier Noria2017-07-021-2/+9
|\
| * Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-02131-131/+0
| * Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-02131-0/+131
| |\
| | * Enforce frozen string in RubocopKir Shatrov2017-07-01131-0/+131
| * | Merge pull request #29534 from y-yagi/clear_screenshots_in_tmp_clear_taskEileen M. Uchitelle2017-07-011-2/+9
| |\ \
| | * | Clear screenshots files in `tmp:clear` taskyuuji.yaginuma2017-06-271-2/+9
* | | | [Railties] require => require_relativeAkira Matsuda2017-07-0170-103/+103
|/ / /
* | | Merge pull request #29418 from dinahshi/scaffold_system_testsEileen M. Uchitelle2017-06-305-11/+68
|\ \ \ | |_|/ |/| |
| * | Add system tests to generate scaffoldDinah Shi2017-06-305-11/+68
* | | 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` instancefatkodima2017-06-241-1/+1
* | | Add `railtie.rb` to the plugin generatorTsukuru Tanimichi2017-06-263-2/+14
|/ /
* | Deprecate an `capify!` method in generators and templatesyuuji.yaginuma2017-06-181-0/+1
* | Add the `<app_root>/test` dir to the `$LOAD_PATH` as a string:Edouard CHIN2017-06-161-1/+1
* | Use `require_relative` instead of `require` with full pathbogdanvlviv2017-06-142-2/+2
* | Merge pull request #29289 from vergenzt/patch-1Vipul A M2017-06-121-0/+3
|\ \
| * | Add note to Railtie docs to use unique filenamesTim Vergenz2017-06-121-0/+3
* | | Merge pull request #29425 from gsamokovarov/drop-the-irb-termGuillermo Iguaran2017-06-121-1/+1
|\ \ \
| * | | Drop IRB out of the web-console Gemfile commentGenadi Samokovarov2017-06-121-1/+1
* | | | Merge pull request #29263 from assain/default_message_encryptor_to_gcmKasper Timm Hansen2017-06-112-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | set message_encryptor default cipher to aes-256-gcmAssain2017-06-122-0/+8
* | | | Access EDITOR through Ruby's cross-platform ENV.Kasper Timm Hansen2017-06-111-2/+2
| |_|/ |/| |
* | | 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 orhantoy/feature/fix-scaffold_controller-gener...Eileen M. Uchitelle2017-06-021-1/+1
|\ \
| * | [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
* | | Merge pull request #29088 from greysteil/better-spacing-in-production-environ...Matthew Draper2017-05-311-3/+4
|\ \ \ | |_|/ |/| |
| * | Better spacing in environments/production.rb fileGrey Baker2017-05-151-3/+4
* | | Replace therubyracer with mini_racerSam2017-05-301-1/+1
* | | Do not use UTF8 in test SecretsCommandTest#test_edit_secretsPavel Valena2017-05-301-1/+1
* | | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-292-6/+5
| |/ |/|
* | Doh. We are doing this on secrets:setup. Revert "Ignore the encrypted secrets...David Heinemeier Hansson2017-05-291-3/+0
* | Merge pull request #29266 from ojiry/add-elm-option-to-generator-descEileen M. Uchitelle2017-05-291-1/+1
|\ \
| * | 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 kamipo/default_env_fall_back_to_default_env_wh...Guillermo Iguaran2017-05-281-1/+1
|\ \
| * | `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is a...Ryuta Kamizono2017-05-251-1/+1
* | | Merge pull request #29146 from y-yagi/fix_29138Kasper Timm Hansen2017-05-281-2/+9
|\ \ \
| * | | Correctly set user_supplied_options when there is no whitespace in option spe...yuuji.yaginuma2017-05-241-2/+9
| |/ /
* | | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-283-0/+9
|\ \ \
| * | | AEAD encrypted cookies and sessionsMichael Coyne2017-05-223-0/+9
| |/ /
* | | Includes namespace in system test skelton when namespace is specifiedyuuji.yaginuma2017-05-281-1/+1
* | | Do not show --webpack option in the plugin help messageash2017-05-262-4/+5
* | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-2621-29/+29
|\ \ \