aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Replace `serve_static_files` in tests with `public_file_server.enabled`.Kasper Timm Hansen2015-11-044-5/+5
| | | | Forgot to do it in 748b2f9, when deprecating `serve_static_files`.
* Merge pull request #22173 from kaspth/enable-public-file-serverKasper Timm Hansen2015-11-046-12/+84
|\ | | | | Add enabled flag to the public file server settings.
| * Move `static_cache_contorl` deprecation changelog entry to Railties.Kasper Timm Hansen2015-11-041-0/+22
| | | | | | | | | | | | | | The configuration for `config.static_cache_control`, and its replacement `config.public_file_server.headers` are implemented in Railties. People would configure this in environment files, which is Railties domain too.
| * Add enabled flag to the public file server.Kasper Timm Hansen2015-11-036-12/+62
| | | | | | | | | | | | | | | | As discussed in https://github.com/rails/rails/pull/19135#issuecomment-153385986. Replaces `serve_static_files` to unify the static options under the `public_file_server` wing. Deprecates `serve_static_files` accessors, but make them use the newer config internally.
* | don't start a new process for every test fileAaron Patterson2015-11-031-8/+21
|/ | | | | | | we can just reuse the parent process. We should figure out what files are commonly required among the test files and try to require them in the parent so that the require time cost is amortized across the processes.
* added missing instructions for `rack-cors`Gaurav Sharma2015-11-031-2/+4
| | | | | `config.middleware.insert_before` changes require to restart the server Also added missing `.` at the EOL.
* Make `db:migrate:status` to render `1_some.rb` format migrate files.yui-knk2015-11-021-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `1_valid_people_have_last_names.rb` and `20150823202140_create_users.rb` are valid migration file name. But `1_valid_people_have_last_names.rb` is rendered as `********** NO FILE **********` when `rake db:migrate:status`. Fix to this bug, this commit includes * define some API private methdos and a Constant `match_to_migration_filename?`, `parse_migration_filename`, and `MigrationFilenameRegexp` * use these methods in `db:migrate:status` task Example: These files are in `db/migrate` * 1_valid_people_have_last_names.rb * 20150819202140_irreversible_migration.rb * 20150823202140_add_admin_flag_to_users.rb * 20150823202141_migration_tests.rb * 2_we_need_reminders.rb * 3_innocent_jointable.rb we can migrate all of them. Before ```shell $ bundle exec rake db:migrate:status ... Status Migration ID Migration Name -------------------------------------------------- up 001 ********** NO FILE ********** up 002 ********** NO FILE ********** up 003 ********** NO FILE ********** up 20150819202140 Irreversible migration up 20150823202140 Add admin flag to users up 20150823202141 Migration tests ``` After ```shell $ bundle exec rake db:migrate:status ... Status Migration ID Migration Name -------------------------------------------------- up 001 Valid people have last names up 002 We need reminders up 003 Innocent jointable up 20150819202140 Irreversible migration up 20150823202140 Add admin flag to users up 20150823202141 Migration tests ```
* Merge pull request #22152 from y-yagi/remove_sass-cache_from_gitignoreAndrew White2015-11-021-1/+0
|\ | | | | remove unnecessary `.sass-cache` from plugin's gitignore template
| * remove unnecessary `.sass-cache` from plugin's gitignore templateyuuji.yaginuma2015-11-021-1/+0
| | | | | | | | Since the sass cache is output to the `tmp/cache/sass`.
* | Route generator should be idempotent - closes #22082Thiago Pinto2015-10-313-1/+20
|/
* rails/application: allow passing an env to config_forSimon Eskildsen2015-10-303-2/+22
|
* Add version constraint to database gem in generated applicationRafael Mendonça França2015-10-294-17/+32
| | | | | | We are using the same version constraint in the database adapters so when a new version of the adapter that doesn't work with the version of rails is released we don't break new applications.
* Properly indent '<head>' and '<body>' within '<html>'Sean Collins2015-10-291-16/+17
|
* Merge pull request #21998 from kddeisz/rake_task_statisticsArthur Nogueira Neves2015-10-285-1/+23
|\ | | | | Allow rake:stats to account for rake tasks
| * Allow rake:stats to account for rake tasksKevin Deisz2015-10-195-1/+23
| |
* | raise `ArgumentError` when `SECRET_KEY_BASE` is an integerArun Agrawal2015-10-272-0/+16
| | | | | | | | | | | | | | If `SECRET_KEY_BASE` or other `secret` gets passed as other then string we need to raise `ArgumentError` to know that it's a wrong argument. Closes #22072
* | Merge pull request #19924 from iamvery/db-tasks-exit-statusSean Griffin2015-10-261-0/+52
|\ \ | | | | | | | | | Explicitly exit with status "1" for create and drop failures
| * | Exit with non-zero status when db:drop failsJay Hayes2015-10-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If the drop task fails for a reason other than the database not existing, processing should end. This is indicated by a non-zero exit status. * Since the backtrace is already printed to screen, we forgo printing it again by using an explicit call to `exit`. * :warning: This modifies the behavior of the db:create task slightly in that the stack trace is no longer printed by default. If the `--trace` option is used, it will print the trace _after_ the error message.
| * | Exit with non-zero status when db:create failsJay Hayes2015-10-201-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If the create task fails for a reason other than the database already existing, processing should end. This is indicated by a non-zero exit status. * Since the backtrace is already printed to screen, we forgo printing it again by using an explicit call to `exit`. * :warning: This modifies the behavior of the db:create task slightly in that the stack trace is no longer printed by default. If the `--trace` option is used, it will print the trace _after_ the error message.
| * | Fix test of drop failureJay Hayes2015-10-201-4/+1
| | | | | | | | | | | | | | | | | | | | | * Previously the sqlite3 adapter could not "fail" on drop. Now an error is raised when no file exists. * Also updates purge to be resilient of drop failures. This is how purge is expected to behave.
| * | Add tests to verify exit status for create/drop failuresJay Hayes2015-10-201-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Running the db:create task when the database already exists isn't really an error case. That is processing may proceed in this case because the database exists as requested. So let's validate that behavior with a test. * Likewise, if the database doesn't exist when running the db:drop task processing may continue as the requested condition is already met. Thus a test.
* | | Tweaked wording used in some tests.Sebastian McKenzie2015-10-251-3/+3
| | |
* | | Use thor class_option to make the primary_key_type option workRafael Mendonça França2015-10-232-6/+10
| | | | | | | | | | | | Also move the method to the right class
* | | Move default uuid generation to active_recordJon McCartie2015-10-232-8/+4
| | |
* | | remove unnecessary readme in dummy applicationyuuji.yaginuma2015-10-232-1/+14
| | | | | | | | | | | | `README` it is changed to `README.rdoc` in 6b126e2, it has been changed to` README.md` further 89a12c9.
* | | `config.generators` should be docummented since it is public APIRafael Mendonça França2015-10-221-1/+1
|/ / | | | | | | [ci skip]
* | Revert " Added an example to show how common secrets can be shared across ↵Sean Griffin2015-10-201-16/+0
| | | | | | | | multiple environments in secrets.yml"
* | Merge pull request #19898 from prathamesh-sonpatki/common-secretsSean Griffin2015-10-201-0/+16
|\ \ | | | | | | Added an example to show how common secrets can be shared across multiple environments in secrets.yml [ci skip]
| * | Added example of sharing secrets in multiple environments in secrets.ymlPrathamesh Sonpatki2015-05-261-0/+16
| | |
* | | Set active_record config for always creating uuids in generatorsJon McCartie2015-10-202-0/+18
| | |
* | | Merge pull request #21978 from ctreatma/console_helper_reloadSean Griffin2015-10-191-1/+1
|\ \ \ | |_|/ |/| | Fix #21977: Removes memoization of helpers in Rails console
| * | Fix #21977: Removes memoization of helpers in Rails consoleCharles Treatman2015-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the Rails console, the `helper` function provides a shorthand for working with application helpers. However, `helper` memoizes the value of `ApplicationController#helpers`. This means that if a user subsequently changes helper code and calls `reload!` in the console, their code changes will not be reflected by the `helper` function, even though the helper was, in fact, reloaded.
* | | remove useless methodyuuji.yaginuma2015-10-181-4/+0
| | | | | | | | | | | | `images` method has been deleted in 2bc4856, `create_images_directory` does nothing.
* | | Use "rake time:zones:all" instead of "rake -D time" [ci skip]Marat Galiev2015-10-171-1/+1
|/ /
* | Merge pull request #21961 from Gaurav2728/migration_class_methods_nodocArthur Nogueira Neves2015-10-141-5/+5
|\ \ | | | | | | migrations Class methods have nodoc, fix it for API [ci skip]
| * | migrations Class methods have nodoc, fix it for API [ci skip]Gaurav Sharma2015-10-141-5/+5
| | |
* | | Merge pull request #20908 from y-yagi/generate_application_job_inside_engineArthur Nogueira Neves2015-10-132-0/+9
|\ \ \ | | | | | | | | add application_job.rb to template of mountable engine
| * | | add application_job.rb to template of mountable engineyuuji.yaginuma2015-07-172-0/+9
| | | | | | | | | | | | | | | | | | | | since cb012467214f6e4bb1ac3987554bb75020b4796b, generated job inherents from ApplicationJob, ApplicationJob is required in the mountable engine.
* | | | Merge pull request #19135 from yuki24/access-control-supportJeremy Daer2015-10-135-6/+46
|\ \ \ \ | |_|/ / |/| | | | | | | Add basic support for access control headers to ActionDispatch::Static
| * | | Add the ability of returning arbitrary headers to ActionDispatch::StaticYuki Nishijima2015-06-135-6/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now ActionDispatch::Static can accept HTTP headers so that developers will have control of returning arbitrary headers like 'Access-Control-Allow-Origin' when a response is delivered. They can be configured through `#config.public_file_server.headers`: config.public_file_server.headers = { "Cache-Control" => "public, max-age=60", "Access-Control-Allow-Origin" => "http://rubyonrails.org" } Also deprecate `config.static_cache_control` in favor of `config.public_file_server.headers`.
* | | | Merge pull request #17388 from akampjes/masterArthur Nogueira Neves2015-10-121-0/+11
|\ \ \ \ | | | | | | | | | | ActionMailer https on URL with force_ssl = true
| * | | | ActionMailer https on URL with force_ssl = trueAndrew Kampjes2015-08-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `config.force_ssl = true` will set config.action_mailer.default_url_options = { protocol: 'https' } If you have turned on force_ssl, and then gone to the effort of setting config.action_mailer.default_url_options = {host: 'example.com'} then you are probably pointing people back to your current app and want https on that too.
* | | | | do not generate manifest.js in pluginsyuuji.yaginuma2015-10-122-1/+2
| | | | | | | | | | | | | | | | | | | | Since the plugin generator do not generate assets, I think manifest.js also that it unnecessary.
* | | | | Merge pull request #21912 from y-yagi/move_prepare_destination_to_publicSean Griffin2015-10-081-1/+2
|\ \ \ \ \ | | | | | | | | | | | | change `prepare_destination` to public API [ci skip]
| * | | | | change `prepare_destination` to public API [ci skip]yuuji.yaginuma2015-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `prepare_destination` has been used in the template file for the generator, I think it should be a public API ref: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/test_unit/generator/templates/generator_test.rb#L8
* | | | | | remove unused requireyuuji.yaginuma2015-10-081-2/+0
|/ / / / / | | | | | | | | | | | | | | | `shellwords` is no longer needed from #20605.
* | | | | Merge pull request #21804 from merhard/mounted_engine_route_fixAndrew White2015-10-071-0/+49
|\ \ \ \ \ | | | | | | | | | | | | Mounted engine route fix
| * | | | | Fix mounted engine named routes regressionMatthew Erhard2015-10-071-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating the url for a mounted engine through its proxy, the path should be the sum of three parts: 1. Any `SCRIPT_NAME` request header or the value of `ActionDispatch::Routing::RouteSet#relative_url_root`. 2. A prefix (the engine's mounted path). 3. The path of the named route inside the engine. Since commit https://github.com/rails/rails/commit/44ff0313c121f528a68b3bd21d6c7a96f313e3d3, this has been broken. Step 2 has been changed to: 2. A prefix (the value of `ActionDispatch::Routing::RouteSet#relative_url_root` + the engine's mounted path). The value of `ActionDispatch::Routing::RouteSet#relative_url_root` is taken into account in step 1 of the route generation and should be ignored when generating the mounted engine's prefix in step 2. This commit fixes the regression by having `ActionDispatch::Routing::RouteSet#url_for` check `options[:relative_url_root]` before falling back to `ActionDispatch::Routing::RouteSet#relative_url_root`. The prefix generating code then sets `options[:relative_url_root]` to an empty string. This empty string is used instead of `ActionDispatch::Routing::RouteSet#relative_url_root` and avoids the duplicate `relative_url_root` value in the final result. This resolves #20920 and resolves #21459
* | | | | | Output inline is set to true in the plugin.Kasper Timm Hansen2015-10-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the reporter to just read the option. Pass output_inline where needed in tests.
* | | | | | Refactor create_test_file to take a pass option.Kasper Timm Hansen2015-10-071-31/+7
| | | | | | | | | | | | | | | | | | | | | | | | Lets us cut the verbose and straight up duplicated setup in 3 tests down to one line.