aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* implements an evented file update checker [Puneet Agarwal]Xavier Noria2015-11-082-1/+4
| | | | | | | | | | | | This is the implementation of the file update checker written by Puneet Agarwal for GSoC 2015 (except for the tiny version of the listen gem, which was 3.0.2 in the original patch). Puneet's branch became too out of sync with upstream. This is the final work in one single clean commit. Credit goes in the first line using a convention understood by the contrib app.
* fix application_controller require_dependency path generated by api scaffold ↵yuuji.yaginuma2015-11-081-1/+1
| | | | | | | | | generator In the app generator, regardless of the namespace, it is adapted to read the same `application_controller.rb`, modified to api generator also be the same behavior. ref 686966a1861e6761021d45f6795de753e8a62216, 06ac63b4c602e4b26cb3bfbf0dfd2bed8b00e786
* [ci skip] Remove final mentions of `static_cache_control` in docs.Kasper Timm Hansen2015-11-051-1/+3
| | | | | | It was deprecated in https://github.com/rails/rails/pull/19135. We're now favoring `public_file_server.headers`.
* Fix `static_cache_control` deprecation warningJon Atack2015-11-051-3/+6
| | | | | | | | | | | | | | | | | | | | | | 1. Fix the message by wrapping the value in missing quotes and adding the missing backtick at the end. Finally, :lipstick: by adding a space inside the curly braces. Before: `config.public_file_server.headers = {'Cache-Control' => public, max-age=31536000} Now: `config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=31536000' }` 2. Display `static_cache_control` instead of static_cache_control. This follows what the 2 neighboring methods are doing. 3. Use strip_heredoc to improve the code formatting and readability like the 2 neighboring methods and wrap to 80 characters.
* Add enabled flag to the public file server.Kasper Timm Hansen2015-11-034-6/+27
| | | | | | | | 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.
* 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.
* 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-311-1/+1
|/
* rails/application: allow passing an env to config_forSimon Eskildsen2015-10-301-2/+2
|
* Add version constraint to database gem in generated applicationRafael Mendonça França2015-10-293-13/+24
| | | | | | 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-283-1/+3
|\ | | | | Allow rake:stats to account for rake tasks
| * Allow rake:stats to account for rake tasksKevin Deisz2015-10-193-1/+3
| |
* | raise `ArgumentError` when `SECRET_KEY_BASE` is an integerArun Agrawal2015-10-271-0/+3
| | | | | | | | | | | | | | 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
* | Move default uuid generation to active_recordJon McCartie2015-10-231-5/+0
| |
* | remove unnecessary readme in dummy applicationyuuji.yaginuma2015-10-231-1/+1
| | | | | | | | `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-201-0/+5
| | |
* | | 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-131-0/+5
|\ \ \ | | | | | | | | add application_job.rb to template of mountable engine
| * | | add application_job.rb to template of mountable engineyuuji.yaginuma2015-07-171-0/+5
| | | | | | | | | | | | | | | | | | | | 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-133-6/+19
|\ \ \ \ | |_|/ / |/| | | | | | | Add basic support for access control headers to ActionDispatch::Static
| * | | Add the ability of returning arbitrary headers to ActionDispatch::StaticYuki Nishijima2015-06-133-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
* | | | do not generate manifest.js in pluginsyuuji.yaginuma2015-10-121-1/+1
| | | | | | | | | | | | | | | | 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.
* | | | Output inline is set to true in the plugin.Kasper Timm Hansen2015-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change the reporter to just read the option. Pass output_inline where needed in tests.
* | | | Hide Minitest's aggregated results if outputting inline.Kasper Timm Hansen2015-10-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd see the failures and errors reported after the run, which is needless, when we've already reported them. Turns: ``` .......................................S....................F This failed bin/rails test test/models/bunny_test.rb:14 .... Finished in 0.100886s, 1020.9583 runs/s, 1001.1338 assertions/s. 2) Failure: BunnyTest#test_something_failing [/Users/kasperhansen/Documents/code/collection_caching_test/test/models/bunny_test.rb:15]: This failed 103 runs, 101 assertions, 1 failures, 0 errors, 1 skips You have skipped tests. Run with --verbose for details. ``` Into: ``` ...................S.......................................F This failed bin/rails test test/models/bunny_test.rb:14 ...................... Finished in 0.069910s, 1473.3225 runs/s, 1444.7143 assertions/s. 103 runs, 101 assertions, 1 failures, 0 errors, 1 skips ```
* | | | Update the URL when changing mailer preview formatsJames Kerr2015-10-061-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Added javascript to update the URL on mailer previews with the currently selected email format. Reloading the page now keeps you on your selected format rather than going back to the default html version.
* | | | Use `Mime[:foo]` instead of `Mime::Type[:FOO]` for back compatJeremy Daer2015-10-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 4.x and earlier didn't support `Mime::Type[:FOO]`, so libraries that support multiple Rails versions would've had to feature-detect whether to use `Mime::Type[:FOO]` or `Mime::FOO`. `Mime[:foo]` has been around for ages to look up registered MIME types by symbol / extension, though, so libraries and plugins can safely switch to that without breaking backward- or forward-compatibility. Note: `Mime::ALL` isn't a real MIME type and isn't registered for lookup by type or extension, so it's not available as `Mime[:all]`. We use it internally as a wildcard for `respond_to` negotiation. If you use this internal constant, continue to reference it with `Mime::ALL`. Ref. efc6dd550ee49e7e443f9d72785caa0f240def53
* | | | Merge pull request #20986 from radar/rails-engine-caller-locationsArthur Nogueira Neves2015-10-041-6/+1
|\ \ \ \ | | | | | | | | | | Remove check for caller_locations in Rails::Engine
| * | | | Remove check for caller_locations in Rails::EngineRyan Bigg2015-07-231-6/+1
| | | | | | | | | | | | | | | | | | | | This is no longer necessary, as the minimum version requirement for Ruby is 2.2.2, and the `caller_locations` feature was added in Ruby 2.0.0. Since Rails no longer supports pre 2.0 versions of Ruby, there is no need to check first if the Kernel does respond to `caller_locations`. The answer is: yes it does.
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-042-3/+3
|\ \ \ \ \
| * | | | | Renamed ‘Return’ to ‘Returns’ [ci skip]Ronak Jangir2015-09-282-3/+3
| | | | | |
* | | | | | Revert "removing Rack::Runtime from the default stack."Aaron Patterson2015-10-032-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 37423e4ff883ad5584bab983aceb4b2b759a1fd8. Jeremy is right that we shouldn't remove this. The fact is that many engines are depending on this middleware to be in the default stack. This ties our hands and forces us to keep the middleware in the stack so that engines will work. To be extremely clear, I think this is another smell of "the rack stack" that we have in place. When manipulating middleware, we should have meaningful names for places in the req / res lifecycle **not** have engines depend on a particular constant be in a particular place in the stack. This is a weakness of the API that we have to figure out a way to address before removing the constant. As far as timing attacks are concerned, we can reduce the granularity such that it isn't useful information for hackers, but is still useful for developers.
* | | | | | Merge pull request #21851 from y-yagi/use_class_to_specify_middlewareKasper Timm Hansen2015-10-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | use class to specify the middleware [ci skip]
| * | | | | | use class to specify the middleware [ci skip]yuuji.yaginuma2015-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | using string for middleware class names is deprecated in 83b767cef90abfc4c2ee9f4b451b0215501fae9a
* | | | | | | removing Rack::Runtime from the default stack.Aaron Patterson2015-10-022-2/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The runtime header is a potential target for timing attacks since it returns the amount of time spent on the server (eliminating network speed). Total time is also not accurate for streaming responses. The middleware can be added back via: ```ruby config.middleware.ues ::Rack::Runtime ```
* | | | | | only construct one request in an engineAaron Patterson2015-09-302-14/+17
| | | | | |
* | | | | | call `default_middleware_stack` before merging stacksAaron Patterson2015-09-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `default_middleware_stack` seems to kick off the `on_load` calls that may mutate the middleware stack. We have to call that method before merging middleware stacks, otherwise the middleware stacks get mutated *after* the app middleware stack is built.