aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* 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-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
| |/ |/| | | | | | | | | | | | | | | | | | | | | * 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-281-2/+9
|\ \ \ | | | | | | | | 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-241-2/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-283-0/+9
|\ \ \ | | | | | | | | AEAD encrypted cookies and sessions
| * | | AEAD encrypted cookies and sessionsMichael Coyne2017-05-223-0/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes encrypted cookies from AES in CBC HMAC mode to Authenticated Encryption using AES-GCM. It also provides a cookie jar to transparently upgrade encrypted cookies to this new scheme. Some other notable changes include: - There is a new application configuration value: +use_authenticated_cookie_encryption+. When enabled, AEAD encrypted cookies will be used. - +cookies.signed+ does not raise a +TypeError+ now if the name of an encrypted cookie is used. Encrypted cookies using the same key as signed cookies would be verified and serialization would then fail due the message still be encrypted.
* | | Includes namespace in system test skelton when namespace is specifiedyuuji.yaginuma2017-05-281-1/+1
| | | | | | | | | | | | Fixes #29247
* | | 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
|\ \ \ | | | | | | | | Define path with __dir__
| * | | Define path with __dir__bogdanvlviv2017-05-2321-29/+29
| |/ / | | | | | | | | | | | | | | | ".. with __dir__ we can restore order in the Universe." - by @fxn Related to 5b8738c2df003a96f0e490c43559747618d10f5f
* | | Merge pull request #29195 from kaspth/rails-secrets-better-edit-exceptionKasper Timm Hansen2017-05-254-29/+59
|\ \ \ | | | | | | | | Make `secrets:edit` run `secrets:setup` if it hasn't already.
| * | | Reorder first secrets edit flow.Kasper Timm Hansen2017-05-254-28/+59
| | | | | | | | | | | | | | | | | | | | | | | | Setup config/secrets.yml.enc with template contents for people to edit. Then generate encryption key and encrypt the initial secrets.
| * | | Remove needless waiting message.Kasper Timm Hansen2017-05-231-1/+0
| |/ / | | | | | | | | | | | | Needed back when we attempted to wait for editors, but now we expect users to pass a -w flag to their $EDITOR.
* | | We dont actually use the ultra short-hand, so no need to complicate things ↵David Heinemeier Hansson2017-05-241-1/+1
| | | | | | | | | | | | with it
* | | Slim down the source definitionDavid Heinemeier Hansson2017-05-241-5/+1
|/ /
* | Unused variableDavid Heinemeier Hansson2017-05-201-1/+0
| |
* | Use recyclable cache keys (#29092)David Heinemeier Hansson2017-05-184-24/+21
|/
* Update system test runner docseileencodes2017-05-142-8/+10
| | | | | | | | | It wasn't clear that system tests don't run with the rest of the test suite and are part of a separate command. This documents the `test:system` command as well as update the Rails runner help documentation to make it clearer that system tests are run via their own command by default.
* Merge pull request #29010 from y-yagi/fix_28988Guillermo Iguaran2017-05-131-2/+14
|\ | | | | Allow irb options to be passed from `rails console` command
| * Allow irb options to be passed from `rails console` commandyuuji.yaginuma2017-05-081-2/+14
| | | | | | | | Fixes #28988
* | rake -T should load development env by default, not testTimo Kilpilehto2017-05-101-1/+1
| |
* | Merge pull request #29022 from ↵Matthew Draper2017-05-101-1/+1
|\ \ | | | | | | | | | | | | y-yagi/allow_to_receive_arbitrary_arguments_in_aggregated_results Allow to receive arbitrary arguments in `aggregated_results`
| * | Allow to receive arbitrary arguments in `aggregated_results`yuuji.yaginuma2017-05-101-1/+1
| |/ | | | | | | | | Argument was added to `aggregated_results` in minitest 5.10.2. Ref: https://github.com/seattlerb/minitest/commit/c6ba2afd90473b76d289562edd24f7d7ca8484f9
* / Allow capybara minor releasesJustin Coyne2017-05-051-1/+1
|/ | | | | | Capybara 2.14.0 was released. Loosen the tight constraint in the generated Gemfile, so that Rails applications can take advantage of the new version
* Move `package.json` creation to `create_root_files`yuuji.yaginuma2017-05-041-4/+5
| | | | | Since `package.json` is created in root directory, it is appropriate to create it in `create_root_files`.
* Merge pull request #28943 from koshigoe/port-arg-has-precedence-over-env-varRafael França2017-05-011-2/+3
|\ | | | | CLI arg `--port` has precedence over env `PORT`
| * CLI arg `--port` has precedence over env `PORT`.koshigoe2017-05-011-2/+3
| |
* | Merge pull request #28939 from kirs/maintain_test_schema_friendlyAndrew White2017-05-011-1/+6
|\ \ | | | | | | Friendly maintain schema error in test runner
| * | Friendly maintain schema failureKir Shatrov2017-04-301-1/+6
| |/
* / Remove unnecessary `package.json` deletionyuuji.yaginuma2017-05-011-4/+0
|/ | | | | The `package.json` is created only if `skip_yarn` is not specified. https://github.com/rails/rails/blob/a4c1282854795d1f0d7696ce1ccbabf94b3d9098/railties/lib/rails/generators/rails/app/app_generator.rb#L202..L204
* Merge pull request #28896 from pschambacher/load_with_sharedRafael França2017-04-261-1/+8
|\ | | | | Added a shared section to config/database.yml that will be loaded for all envs
| * Added a shared section to config/database.yml that will be loaded for all ↵Pierre Schambacher2017-04-261-1/+8
| | | | | | | | environments
* | Merge pull request #28244 from ixti/improve/action-mailer-preview-paramsRafael França2017-04-262-4/+10
|\ \ | |/ |/| Pass request params to ActionMailer::Preview
| * Pass request params to ActionMailer::PreviewAlexey Zapparov2017-03-012-4/+10
| |
* | Merge pull request #28839 from y-yagi/fix-yarn-exit-statusRafael França2017-04-251-2/+3
|\ \ | | | | | | Ensure bin/yarn matches the one generated by webpacker
| * | Ensure bin/yarn matches the one generated by webpackeryuuji.yaginuma2017-04-231-2/+3
| | | | | | | | | | | | | | | | | | Import from https://github.com/rails/webpacker/pull/277. Fixes https://github.com/rails/webpacker/issues/278