| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into require_relative_2017 | Xavier Noria | 2017-07-02 | 6 | -12/+61 |
|\ |
|
| * | Remove redundant `assert_respond_to` | Ryuta Kamizono | 2017-07-03 | 1 | -3/+0 |
| * | Move test related to `tmp:clear` task to `tmp_test.rb` | yuuji.yaginuma | 2017-07-02 | 2 | -7/+7 |
| * | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string" | Matthew Draper | 2017-07-02 | 253 | -253/+0 |
| * | Merge pull request #29540 from kirs/rubocop-frozen-string | Matthew Draper | 2017-07-02 | 253 | -0/+253 |
| |\ |
|
| | * | Enforce frozen string in Rubocop | Kir Shatrov | 2017-07-01 | 252 | -0/+252 |
| * | | Merge pull request #29534 from y-yagi/clear_screenshots_in_tmp_clear_task | Eileen M. Uchitelle | 2017-07-01 | 3 | -2/+49 |
| |\ \ |
|
| | * | | Clear screenshots files in `tmp:clear` task | yuuji.yaginuma | 2017-06-27 | 3 | -2/+49 |
| * | | | Add source code and changelog link to railties.gemspec | Koichi ITO | 2017-07-01 | 1 | -0/+5 |
* | | | | [Railties] require => require_relative | Akira Matsuda | 2017-07-01 | 71 | -107/+107 |
|/ / / |
|
* | | | Merge pull request #29418 from dinahshi/scaffold_system_tests | Eileen M. Uchitelle | 2017-06-30 | 7 | -13/+104 |
|\ \ \
| |_|/
|/| | |
|
| * | | Add system tests to generate scaffold | Dinah Shi | 2017-06-30 | 7 | -13/+104 |
* | | | Ignore public/assets | amingilani | 2017-06-27 | 1 | -0/+4 |
| |/
|/| |
|
* | | Merge pull request #29560 from fatkodima/remove_unnecessary_tap_call | Rafael França | 2017-06-26 | 1 | -1/+1 |
|\ \ |
|
| * | | Remove unnecessary `tap` call on `ActionDispatch::MiddlewareStack` instance | fatkodima | 2017-06-24 | 1 | -1/+1 |
* | | | Add `railtie.rb` to the plugin generator | Tsukuru Tanimichi | 2017-06-26 | 5 | -2/+20 |
|/ / |
|
* | | Deprecate an `capify!` method in generators and templates | yuuji.yaginuma | 2017-06-18 | 3 | -2/+10 |
* | | Add the `<app_root>/test` dir to the `$LOAD_PATH` as a string: | Edouard CHIN | 2017-06-16 | 1 | -1/+1 |
* | | Use `require_relative` instead of `require` with full path | bogdanvlviv | 2017-06-14 | 5 | -7/+7 |
* | | Merge pull request #29289 from vergenzt/patch-1 | Vipul A M | 2017-06-12 | 1 | -0/+3 |
|\ \ |
|
| * | | Add note to Railtie docs to use unique filenames | Tim Vergenz | 2017-06-12 | 1 | -0/+3 |
* | | | Merge pull request #29425 from gsamokovarov/drop-the-irb-term | Guillermo Iguaran | 2017-06-12 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Drop IRB out of the web-console Gemfile comment | Genadi Samokovarov | 2017-06-12 | 1 | -1/+1 |
* | | | | Merge pull request #29263 from assain/default_message_encryptor_to_gcm | Kasper Timm Hansen | 2017-06-11 | 2 | -0/+8 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | set message_encryptor default cipher to aes-256-gcm | Assain | 2017-06-12 | 2 | -0/+8 |
* | | | | Access EDITOR through Ruby's cross-platform ENV. | Kasper Timm Hansen | 2017-06-11 | 1 | -2/+2 |
| |_|/
|/| | |
|
* | | | Make i18n test match the description of the test | Guillermo Iguaran | 2017-06-09 | 1 | -1/+1 |
* | | | Ensure MSSQL password uses real ENV var. | Ken Collins | 2017-06-05 | 1 | -2/+2 |
|/ / |
|
* | | Use mattr_accessor default: option throughout the project | Genadi Samokovarov | 2017-06-03 | 2 | -3/+4 |
* | | Make Rails welcome page responsive | Lucas Caton | 2017-06-03 | 1 | -4/+14 |
* | | Merge pull request #29079 from orhantoy/feature/fix-scaffold_controller-gener... | Eileen M. Uchitelle | 2017-06-02 | 1 | -1/+1 |
|\ \ |
|
| * | | [ci skip] Fix `scaffold_controller` generator usage | Orhan Toy | 2017-05-29 | 1 | -1/+1 |
* | | | Remove the pathname dependency from bin/update and bin/setup | Ben Woosley | 2017-05-31 | 2 | -4/+2 |
* | | | Merge pull request #29088 from greysteil/better-spacing-in-production-environ... | Matthew Draper | 2017-05-31 | 1 | -3/+4 |
|\ \ \
| |_|/
|/| | |
|
| * | | Better spacing in environments/production.rb file | Grey Baker | 2017-05-15 | 1 | -3/+4 |
* | | | Replace therubyracer with mini_racer | Sam | 2017-05-30 | 2 | -2/+2 |
* | | | Do not use UTF8 in test SecretsCommandTest#test_edit_secrets | Pavel Valena | 2017-05-30 | 2 | -2/+2 |
* | | | Add option for class_attribute default (#29270) | David Heinemeier Hansson | 2017-05-29 | 2 | -6/+5 |
| |/
|/| |
|
* | | Doh. We are doing this on secrets:setup. Revert "Ignore the encrypted secrets... | David Heinemeier Hansson | 2017-05-29 | 1 | -3/+0 |
* | | Merge pull request #29266 from ojiry/add-elm-option-to-generator-desc | Eileen M. Uchitelle | 2017-05-29 | 1 | -1/+1 |
|\ \ |
|
| * | | Add elm option of webpack to generator description | Ryoji Yoshioka | 2017-05-29 | 1 | -1/+1 |
* | | | Ignore the encrypted secrets key file that is created by rails secrets:setup | David Heinemeier Hansson | 2017-05-29 | 1 | -0/+3 |
|/ / |
|
* | | Merge pull request #29208 from kamipo/default_env_fall_back_to_default_env_wh... | Guillermo Iguaran | 2017-05-28 | 1 | -1/+1 |
|\ \ |
|
| * | | `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is a... | Ryuta Kamizono | 2017-05-25 | 1 | -1/+1 |
* | | | Merge pull request #29146 from y-yagi/fix_29138 | Kasper Timm Hansen | 2017-05-28 | 2 | -2/+15 |
|\ \ \ |
|
| * | | | Correctly set user_supplied_options when there is no whitespace in option spe... | yuuji.yaginuma | 2017-05-24 | 2 | -2/+15 |
| |/ / |
|
* | | | Merge pull request #28132 from mikeycgto/aead-encrypted-cookies | Kasper Timm Hansen | 2017-05-28 | 4 | -9/+93 |
|\ \ \ |
|
| * | | | AEAD encrypted cookies and sessions | Michael Coyne | 2017-05-22 | 4 | -9/+93 |
| |/ / |
|
* | | | Make reset execution assertions easier to read. | Kasper Timm Hansen | 2017-05-28 | 1 | -15/+11 |
* | | | Includes namespace in system test skelton when namespace is specified | yuuji.yaginuma | 2017-05-28 | 2 | -1/+6 |