| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | 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 |
* | | | | Merge branch 'master' into unlock-minitest | Kasper Timm Hansen | 2017-05-29 | 75 | -254/+549 |
|\| | | |
|
| * | | | 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 |
| * | | | Use models to match the docs. | Kasper Timm Hansen | 2017-05-27 | 1 | -1/+1 |
| * | | | Merge pull request #29238 from ashishg-qburst/generator | Rafael França | 2017-05-26 | 2 | -4/+5 |
| |\ \ \ |
|
| | * | | | Do not show --webpack option in the plugin help message | ash | 2017-05-26 | 2 | -4/+5 |
| * | | | | ActiveSupport::CurrentAttributes provides a thread-isolated attributes single... | David Heinemeier Hansson | 2017-05-26 | 1 | -0/+88 |
| |/ / / |
|
| * | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__ | Matthew Draper | 2017-05-26 | 34 | -53/+53 |
| |\ \ \ |
|
| | * | | | Define path with __dir__ | bogdanvlviv | 2017-05-23 | 34 | -53/+53 |
| | |/ / |
|
| * | | | Remove redundant test method | Andy Atkinson | 2017-05-25 | 1 | -7/+1 |
| * | | | Merge pull request #29195 from kaspth/rails-secrets-better-edit-exception | Kasper Timm Hansen | 2017-05-25 | 5 | -34/+61 |
| |\ \ \ |
|
| | * | | | Reorder first secrets edit flow. | Kasper Timm Hansen | 2017-05-25 | 5 | -33/+61 |
| | * | | | Remove needless waiting message. | Kasper Timm Hansen | 2017-05-23 | 1 | -1/+0 |
| | |/ / |
|
| * | | | We dont actually use the ultra short-hand, so no need to complicate things wi... | David Heinemeier Hansson | 2017-05-24 | 1 | -1/+1 |
| * | | | Slim down the source definition | David Heinemeier Hansson | 2017-05-24 | 1 | -5/+1 |
| |/ / |
|
| * | | Unused variable | David Heinemeier Hansson | 2017-05-20 | 1 | -1/+0 |
| * | | Use recyclable cache keys (#29092) | David Heinemeier Hansson | 2017-05-18 | 7 | -28/+28 |
| |/ |
|
| * | Update system test runner docs | eileencodes | 2017-05-14 | 2 | -8/+10 |
| * | Merge pull request #29010 from y-yagi/fix_28988 | Guillermo Iguaran | 2017-05-13 | 3 | -6/+32 |
| |\ |
|
| | * | Allow irb options to be passed from `rails console` command | yuuji.yaginuma | 2017-05-08 | 3 | -6/+32 |
| * | | rake -T should load development env by default, not test | Timo Kilpilehto | 2017-05-10 | 1 | -1/+1 |
| * | | Merge pull request #29022 from y-yagi/allow_to_receive_arbitrary_arguments_in... | Matthew Draper | 2017-05-10 | 1 | -1/+1 |
| |\ \ |
|
| | * | | Allow to receive arbitrary arguments in `aggregated_results` | yuuji.yaginuma | 2017-05-10 | 1 | -1/+1 |
| | |/ |
|
| * | | Merge pull request #28995 from jcoyne/update_capybara | Matthew Draper | 2017-05-09 | 1 | -1/+1 |
| |\ \
| | |/
| |/| |
|
| | * | Allow capybara minor releases | Justin Coyne | 2017-05-05 | 1 | -1/+1 |
| * | | Should escape meta characters in regexp | Ryuta Kamizono | 2017-05-07 | 11 | -75/+75 |
| |/ |
|
| * | Move `package.json` creation to `create_root_files` | yuuji.yaginuma | 2017-05-04 | 1 | -4/+5 |
| * | Merge pull request #28943 from koshigoe/port-arg-has-precedence-over-env-var | Rafael França | 2017-05-01 | 2 | -2/+15 |
| |\ |
|
| | * | CLI arg `--port` has precedence over env `PORT`. | koshigoe | 2017-05-01 | 2 | -2/+15 |
| * | | Merge pull request #28939 from kirs/maintain_test_schema_friendly | Andrew White | 2017-05-01 | 1 | -1/+6 |
| |\ \ |
|
| | * | | Friendly maintain schema failure | Kir Shatrov | 2017-04-30 | 1 | -1/+6 |
| | |/ |
|
| * / | Remove unnecessary `package.json` deletion | yuuji.yaginuma | 2017-05-01 | 1 | -4/+0 |
| |/ |
|
| * | Cleanup CHANGELOGs [ci skip] | Ryuta Kamizono | 2017-04-30 | 1 | -1/+0 |
| * | Also raise error when VERSION is nil | Rafael Mendonça França | 2017-04-27 | 1 | -0/+6 |