aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-2634-53/+53
|\ \ \ | | | | | | | | Define path with __dir__
| * | | Define path with __dir__bogdanvlviv2017-05-2334-53/+53
| |/ / | | | | | | | | | | | | | | | ".. with __dir__ we can restore order in the Universe." - by @fxn Related to 5b8738c2df003a96f0e490c43559747618d10f5f
* | | Remove redundant test methodAndy Atkinson2017-05-251-7/+1
| | |
* | | Merge pull request #29195 from kaspth/rails-secrets-better-edit-exceptionKasper Timm Hansen2017-05-255-34/+61
|\ \ \ | | | | | | | | Make `secrets:edit` run `secrets:setup` if it hasn't already.
| * | | Reorder first secrets edit flow.Kasper Timm Hansen2017-05-255-33/+61
| | | | | | | | | | | | | | | | | | | | | | | | 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-187-28/+28
|/
* 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-133-6/+32
|\ | | | | Allow irb options to be passed from `rails console` command
| * Allow irb options to be passed from `rails console` commandyuuji.yaginuma2017-05-083-6/+32
| | | | | | | | 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
* | Merge pull request #28995 from jcoyne/update_capybaraMatthew Draper2017-05-091-1/+1
|\ \ | |/ |/| Allow capybara minor releases
| * 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
* | Should escape meta characters in regexpRyuta Kamizono2017-05-0711-75/+75
|/
* 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-012-2/+15
|\ | | | | CLI arg `--port` has precedence over env `PORT`
| * CLI arg `--port` has precedence over env `PORT`.koshigoe2017-05-012-2/+15
| |
* | 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
* Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-04-301-1/+0
| | | | | | * Remove trailing spaces. * Add backticks around method and command. * Fix indentation.
* Also raise error when VERSION is nilRafael Mendonça França2017-04-271-0/+6
| | | | Fix #28905
* Merge pull request #28896 from pschambacher/load_with_sharedRafael França2017-04-263-4/+49
|\ | | | | 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-263-4/+49
| | | | | | | | environments
* | Merge pull request #28897 from rafaelfranca/fix-name-error-error-pageAaron Patterson2017-04-261-0/+14
|\ \ | | | | | | Do not try to encoding the parameters when the controller is not defined
| * | Do not try to encoding the parameters when the controller is not definedRafael Mendonça França2017-04-261-0/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you have a route that points to an nonexistent controller we raise an exception. This exception was being caught by the DebugExceptions middleware in development, but when trying to render the error page, we are reading the request format[[1][]]. To determine the request format we are reading the format parameters[[2][]], and to be able to read the parameters we need to encode them[[3][]]. This was raising another exception that to encode the parameter we try to load the controller to determine if we need to encode the parameters are binary[[4][]]. This new exception inside the DebugExceptions middleware makes Rails to render a generic error page. To avoid this new exception now we only encode the parameters when the controller can be loaded. Fixes #28892 [1]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb#L80 [2]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/http/mime_negotiation.rb#L63 [3]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/http/parameters.rb#L58 [4]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/http/parameters.rb#L88
* | Merge pull request #28244 from ixti/improve/action-mailer-preview-paramsRafael França2017-04-263-4/+61
|\ \ | |/ |/| Pass request params to ActionMailer::Preview
| * Pass request params to ActionMailer::PreviewAlexey Zapparov2017-03-013-4/+61
| |
* | 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
* | | Merge pull request #28831 from kamipo/respond_to_missing_should_be_privateRafael França2017-04-251-4/+4
|\ \ \ | | | | | | | | `respond_to_missing?` should be private
| * | | `respond_to_missing?` should be privateRyuta Kamizono2017-04-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of 03d3f036. Some of `respond_to?` were replaced to `respond_to_missing?` in 03d3f036. But the visibility is still public. It should be private.
* | | | Replace \Z to \zRyuta Kamizono2017-04-241-3/+3
| |/ / |/| | | | | | | | \Z was a mistake of \z. Replace \Z to \z to prevent newly \Z added.
* | | Set to `form_with_generates_remote_forms` only when config is explicitly ↵yuuji.yaginuma2017-04-221-0/+28
|/ / | | | | | | | | | | | | | | | | specified Without this check, even if config is not specified, `ActionView::Helpers::FormHelper.form_with_generates_remote_forms` always be set to nil and remote form not be generated. Follow up to 128b804c6ce40fcbde744f294f8cb98654f6efec
* | Configure form_with_generates_remote_forms in its own initializerRafael Mendonça França2017-04-211-0/+32
| | | | | | | | | | | | | | | | | | This configuration is not present in ActionView::Base so we can't let the action_view.set_configs initializer set it. Also add tests to make sure this config works. Fixes #28824
* | Namespace CSS selectors on error pagesJan Krutisch2017-04-204-18/+25
| | | | | | | | The css selectors on the generated error pages are too broad (for example `text-align: center` on `body` and thus bleed out to the following pages (say, by pressing the back button) when using Turbolinks. This commit namespaces all the selectors.
* | Merge pull request #28708 from y-yagi/dont_generate_system_test_filesRafael França2017-04-192-0/+15
|\ \ | | | | | | Don't generate system test files if `skip_system_test` option is specified
| * | Don't generate system test files if `skip_system_test` option is specifiedyuuji.yaginuma2017-04-122-0/+15
| | |
* | | Use released sass-rails instead of master versionRafael Mendonça França2017-04-191-1/+1
| | |
* | | Add additional raise UnknownMigrationVersionErrorbogdanvlviv2017-04-191-1/+31
| | | | | | | | | | | | | | | Raise error on the movement of migrations when the current migration does not exist.
* | | Fix `bin/rails db:forward` first migrationbogdanvlviv2017-04-191-0/+25
| | |
* | | Merge pull request #28685 from rails/smooth-form-with-upgradingKasper Timm Hansen2017-04-173-4/+4
|\ \ \ | | | | | | | | Smooth form with upgrading
| * | | Add `form_with_generates_remote_forms` config.Kasper Timm Hansen2017-04-163-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows users to not have remote forms by default, since there's more JS harness, e.g. bundling rails-ujs, otherwise. Also don't skip creating defaults file anymore. Sprockets isn't the only new config.
* | | | Let run_secrets_generator handle chdir.Kasper Timm Hansen2017-04-161-3/+1
| | | |
* | | | Use the config value directly when call `secrets`yuuji.yaginuma2017-04-164-18/+31
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, `read_encrypted_secrets` is set with initializer. Therefore if refer to `secrets` in config, `read_encrypted_secrets` is false, so can not get the value of `secrets.yml.enc`. In order to be able to refer to secrets in config, modified to refer to `config.read_encrypted_secrets` when calling `secrets`. Fixes #28618.