aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
Commit message (Collapse)AuthorAgeFilesLines
* Improve generated config initializer filesJon Atack2016-01-132-4/+6
| | | | | | | | - Fix grammar. - Improve readability/understanding. - Wrap lines at 80 characters. [skip ci]
* Default new apps to tag logs with `request_id`schneems2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In high volume applications it can be very difficult to figure out what is happening in logs because each request is not easily identified. For example 3 requests could look something like this: ``` Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:21 +0000 Rendered welcome/index.html.erb within layouts/application (0.1ms) Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:22 +0000 Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:23 +0000 Rendered welcome/index.html.erb within layouts/application (0.1ms) Processing by WelcomeController#index as HTML Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) Processing by WelcomeController#index as HTML Rendered welcome/index.html.erb within layouts/application (0.1ms) Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) Processing by WelcomeController#index as HTML Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) ``` The `:request_id` log tag ensures that each request is tagged with a unique identifier. While they are still interleaved it is possible to figure out which lines belong to which requests. Like: ``` [c6034478-4026-4ded-9e3c-088c76d056f1] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:21 +0000 [c6034478-4026-4ded-9e3c-088c76d056f1] Rendered welcome/index.html.erb within layouts/application (0.1ms) [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:22 +0000 [acfab2a7-f1b7-4e15-8bf6-cdaa008d102c] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:23 +0000 [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Rendered welcome/index.html.erb within layouts/application (0.1ms) [c6034478-4026-4ded-9e3c-088c76d056f1] Processing by WelcomeController#index as HTML [c6034478-4026-4ded-9e3c-088c76d056f1] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Processing by WelcomeController#index as HTML [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Rendered welcome/index.html.erb within layouts/application (0.1ms) [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) [acfab2a7-f1b7-4e15-8bf6-cdaa008d102c] Processing by WelcomeController#index as HTML [acfab2a7-f1b7-4e15-8bf6-cdaa008d102c] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) ``` Now if you have the logs and you find this unique ID you can filter to only look at information from that request. So a filtered log output would be very clear: ``` [c6034478-4026-4ded-9e3c-088c76d056f1] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:21 +0000 [c6034478-4026-4ded-9e3c-088c76d056f1] Rendered welcome/index.html.erb within layouts/application (0.1ms) [c6034478-4026-4ded-9e3c-088c76d056f1] Processing by WelcomeController#index as HTML [c6034478-4026-4ded-9e3c-088c76d056f1] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) ``` In addition to this benefit the `:request_id` can be set via the `X-Request-ID` header so that the same request could be traced between multiple components. For example a request comes in Nginx (or another load balancer) could assign a request id. As the load balancer processes the request I can log using that id, then when the request is passed on to Rails, the same id is used. That way if a problem is determined to be not caused in Rails it could be traced back to other components with the same ID. You can set a value in nginx for example using something like this: ``` location / { proxy_pass http://upstream; proxy_set_header X-Request-Id $pid-$msec-$remote_addr-$request_length; } # http://stackoverflow.com/questions/17748735/setting-a-trace-id-in-nginx-load-balancer ``` Heroku sets this header value so problems like timeouts that are logged by like router can be traced back to specific request within the application. Whether you are using components that are setting request ID or not, all production applications can benefit from the additional debugging information of having a unique identifier for all requests. This change will only affect new applications, anyone can opt out by commenting or removing the line in `config/production.rb`.
* Merge pull request #22939 from ↵Rafael França2016-01-062-1/+5
|\ | | | | | | | | y-yagi/make_generated_controller_test_file_work_correctly make generated controller test work correctly
| * make generated controller test work correctlyyuuji.yaginuma2016-01-062-1/+5
| | | | | | | | | | | | | | Since the `#file_name` that not consideration for the namespace, if generate a controller with a namespace, not the correct url helper generation, it had become an error to run the test. Modified to generate the correct url helper, even if it is produced a namespace with controller.
* | Merge pull request #22275 from mastahyeti/per-form-csrfRafael França2016-01-061-0/+4
|\ \ | |/ |/| Per-form CSRF tokens
| * add option for per-form CSRF tokensBen Toews2016-01-041-0/+4
| |
* | :scissors: Unnecessary spacing in the generated codeAkira Matsuda2016-01-051-1/+1
|/
* Merge pull request #22874 from ↵Rafael França2016-01-012-0/+0
|\ | | | | | | | | prathamesh-sonpatki/create-application-model-under-namespaced-dir-in-plugin Create application_record.rb under namespaced directory in plugin
| * Create application_record under namespaced directory in pluginPrathamesh Sonpatki2016-01-012-0/+0
| | | | | | | | | | | | - Earlier it was creating application_record.rb under `app/models`, after this change, it will create application_record.rb under `app/models/plugin_name` similar to other application classes.
* | Remove a wasted spaceShota Iguchi2016-01-011-1/+1
|/
* [ci skip] Space out framework names in USAGEKasper Timm Hansen2015-12-302-5/+5
| | | | | | Two USAGE files were referring to Active Record and Active Model without a space, which is incorrect because we're referring to the framework name and not the constants.
* Add sass-rails back to the default GemfileRafael Mendonça França2015-12-301-0/+2
| | | | It was removed by mistake at 877a411d0c16baa4e670dae9a28f5cfcc201adc1
* Changed default value of `:rc` option to `nil`Prathamesh Sonpatki2015-12-251-1/+1
| | | | | | | - This fixes an error thrown by Thor because type of default value of `:rc` option which is `:boolean` does not match with it's default type which is `string`. - Ref - https://github.com/erikhuda/thor/blob/master/lib/thor/parser/option.rb#L125
* :scissors: whitespace in generated config files [skip ci]Jon Atack2015-12-242-2/+2
|
* Merge pull request #22750 from nettofarah/patch-1Sean Griffin2015-12-231-1/+26
|\ | | | | Plugin Usage and Installation instructions
| * Plugin Usage and Installation instructionsNetto Farah2015-12-231-1/+26
| |
* | Merge pull request #22757 from paulkogel/patch-1Rafael França2015-12-221-1/+1
|\ \ | | | | | | seeds.rb.tt: fix English.
| * | seeds.rb.tt: fix English.Paul Kögel2015-12-221-1/+1
| | |
* | | remove cors initializer from rails appyuuji.yaginuma2015-12-221-0/+6
|/ / | | | | | | | | `rack-cors` gem is defined in Gemfile by default only if the api, not defined by default in rails app.
* | Merge pull request #22753 from gwincr11/keeps-options-breaks-assetsMatthew Draper2015-12-221-1/+1
|\ \ | |/ |/| Fix .keep file issue with ActionCable
| * Fix .keep file issue with ActionCableCory Gwin2015-12-211-1/+1
| | | | | | | | | | | | Fixes #22708 Make sure the channels file is create in assets/javascript/ so require tree works in asset pipeline.
* | Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cableRafael França2015-12-211-0/+8
|\ \ | | | | | | Ensure Action Cable files are removed when `skip_action_cable` is set.
| * | Ensure Action Cable files are removed when `skip_action_cable` is set.Jey Balachandran2015-12-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Action Cable generators creates four files which need to be removed if `skip_action_cable` is set. 1. `app/assets/javascripts/cable.coffee` 2. `app/channels/application_cable/channel.rb` 3. `app/channels/application_cable/connection.rb` 4. `config/redis/cable.yml` Fixes #22669.
* | | Merge pull request #22684 from ↵Yves Senn2015-12-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | teknofire/fix-using-add_resource-with-a-block-after-gem-call Fix using add_resource with a block after gem in custom generators
| * | | Fixes using `add_source` with a block after using `gem` in a custom railsWill Fisher2015-12-211-1/+1
| |/ / | | | | | | | | | generator template.
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-12-201-2/+2
|\ \ \ | |_|/ |/| |
| * | remove extra spaces in fixtures doc partGaurav Sharma2015-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Every time when a fixture generate, it’s also generating improper doc. one: {} # column: value # two: {} # column: value ```
* | | Merge pull request #22683 from ↵Richard Schneeman2015-12-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | gwincr11/No-Doc-Rails__Generators__Actions__CreateMigration Add No Doc
| * | | Add No DocCory Gwin2015-12-181-1/+1
| | | | | | | | | | | | | | | | In reference to rails/rail#22403 add a :nodoc:
* | | | Merge pull request #22690 from claudiob/remove-blank-lineRichard Schneeman2015-12-181-1/+1
|\ \ \ \ | | | | | | | | | | Remove blank line generated in config.ru
| * | | | Remove blank line generated in config.ruclaudiob2015-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Follow the lines of the other `.tt` files ([example](https://github.com/rails/rails/blob/1611ab4db173a7596a7a94c58dabf1483f070304/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt#L26)) that have the space after the condition to avoid too many white lines in the resulted file.
* | | | | Explain what initializer/config_serializer doesclaudiob2015-12-181-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | In line with the other initializers, add a short comment that explains what happens when you change the value of the initializer. [ci skip]
* | | / initializers/cookies_serializer is not new to 5.0claudiob2015-12-181-1/+0
| |_|/ |/| | | | | | | | | | | | | | | | | [ci skip] The initializer has existed since 4.1, for instance see: https://github.com/rails/rails/blob/v4.1.0/railties/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb
* | | Don't need to use `Array.wrap`Rafael Mendonça França2015-12-182-2/+2
| | |
* | | Merge pull request #22657 from matthewd/loosen-versionRafael Mendonça França2015-12-183-3/+17
|\ \ \ | | | | | | | | | | | | Allow normal version updates within a release series
| * | | Allow normal version updates within a release seriesMatthew Draper2015-12-183-3/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We originally chose to apply very strict versioning on the `rails` entry in the Gemfile, because our future versioning policy was not strongly defined. Now it is, and our policy is very much designed on the expectation that people will regularly update to the latest patch level in their release series... so we should encourage that. Of course, Gemfile.lock will do its job and prevent unplanned updates, just as it does for every other gem in the bundle... but if you run `bundle update`, we want to get you the latest bug/security fixes without requiring a manual edit of the Gemfile entry. Our current version could be a few different shapes, so it takes a bit of work to find the right specifier, but in principle, we match anything of the form x.y.*, where x.y matches our current release series.
* | | Refer to rails command instead of rake in a bunch of placesDavid Heinemeier Hansson2015-12-181-1/+1
| | | | | | | | | | | | Still more to do. Please assist!
* | | Explain reason for eager loadingDavid Heinemeier Hansson2015-12-181-0/+1
| | |
* | | Explain Redis' role in Action CableDavid Heinemeier Hansson2015-12-181-0/+1
| | |
* | | Bring comment in line with rest of initializersDavid Heinemeier Hansson2015-12-181-2/+2
| | |
* | | Explain the concept of config initializers for backwards compatibilityDavid Heinemeier Hansson2015-12-183-2/+5
| | |
* | | Fix spacingDavid Heinemeier Hansson2015-12-181-1/+1
| | |
* | | These options are not changed nearly often enough to warrant inclusion like ↵David Heinemeier Hansson2015-12-181-8/+0
| | | | | | | | | | | | this at a high level
* | | Better explanationDavid Heinemeier Hansson2015-12-181-2/+6
| | |
* | | Use the rails command, not rake, for all rails commandsDavid Heinemeier Hansson2015-12-182-6/+6
| | |
* | | README.md in the app is now used to describe the app itself, not RailsDavid Heinemeier Hansson2015-12-181-1/+0
| | |
* | | More sensible ordering with the more important options firstDavid Heinemeier Hansson2015-12-181-12/+12
| | |
* | | List the major frameworks you can remove togetherDavid Heinemeier Hansson2015-12-181-3/+3
| | |
* | | fix indentation of generated controller testyuuji.yaginuma2015-12-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` # before module Bukkits class UsersControllerTest < ActionDispatch::IntegrationTest include Engine.routes.url_helpers setup do @user = bukkits_users(:one) end ``` ``` # after module Bukkits class UsersControllerTest < ActionDispatch::IntegrationTest include Engine.routes.url_helpers setup do @user = bukkits_users(:one) end ```
* | | Ignore Byebug command history fileAkira Matsuda2015-12-181-0/+3
| | | | | | | | | | | | | | | This file is generated by a gem that is bundled by default in the generated Rails app, just like .sqlite3 files. Hence it might be natural to be ignored here rather than in each developer's .gitignore_global.