aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #22684 from ↵Yves Senn2015-12-213-1/+14
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | 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-213-1/+14
| |/ / / | | | | | | | | | | | | generator template.
* | | | Merge pull request #22692 from ryohashimoto/22669_api_generatorDavid Heinemeier Hansson2015-12-211-0/+30
|\ \ \ \ | | | | | | | | | | Action Cable channel generator doesn't create JS assets if options[:rails][:assets] is false
| * | | | Action Cable channel generator should not create JS assets in --api modeRyo Hashimoto2015-12-191-0/+30
| |/ / /
* | | | Merge pull request #22698 from y-yagi/display_detail_info_on_inline_reportKasper Timm Hansen2015-12-215-7/+19
|\ \ \ \ | | | | | | | | | | display detailed information in inline reporting
| * | | | display detailed information in inline reportingyuuji.yaginuma2015-12-215-7/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The errors message only was not displayed, as if it did not use the inline reporting, modified to also information the method name and the like in error are displayed. ``` # before Failed assertion, no message given. bin/rails test test/models/user_test.rb:5 ``` ``` # after Failure: UserTest#test_the_truth: Failed assertion, no message given. bin/rails test test/models/user_test.rb:5 ```
* | | | 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
* | | | Add CHANGELOG headers for Rails 5.0.0.beta1eileencodes2015-12-181-0/+5
| | | |
* | | | Change `alpha` to `beta1` to prep for release of Rails 5eileencodes2015-12-181-1/+1
| | | | | | | | | | | | | | | | :tada: :beers:
* | | | Don't need to use `Array.wrap`Rafael Mendonça França2015-12-182-2/+2
| | | |
* | | | Do not check the version anymoreRafael Mendonça França2015-12-181-2/+2
| | | | | | | | | | | | | | | | | | | | Our logic is complex now and we don't need to check the version to asset the behavior so I'm removing the checking here.
* | | | Merge pull request #22657 from matthewd/loosen-versionRafael Mendonça França2015-12-184-3/+32
|\ \ \ \ | | | | | | | | | | | | | | | Allow normal version updates within a release series
| * | | | Allow normal version updates within a release seriesMatthew Draper2015-12-184-3/+32
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Use released rackRafael Mendonça França2015-12-181-2/+1
|/ / /
* | | Merge pull request #22642 from seuros/remove-mysql-adapterMatthew Draper2015-12-181-3/+3
|\ \ \ | | | | | | | | | | | | Remove legacy mysql adapter
| * | | Remove legacy mysql adapterAbdelkader Boudih2015-12-171-3/+3
| | | |
* | | | Use release sprockets-railsRafael Mendonça França2015-12-171-1/+0
| | | |
* | | | Merge pull request #22627 from rails/application-mailer-by-defaultRafael França2015-12-1712-42/+29
|\ \ \ \ | | | | | | | | | | ApplicationMailer should be generated by default just like every other Application* parent
| * | | | ApplicationMailer should be generated by default just like every other ↵David Heinemeier Hansson2015-12-1711-41/+28
| | | | | | | | | | | | | | | | | | | | Application* parent
| * | | | Fix warningRafael Mendonça França2015-12-171-1/+1
| |/ / /
* / / / Use released arelRafael Mendonça França2015-12-171-1/+0
|/ / /
* | | Generate API doc for actioncableArun Agrawal2015-12-171-0/+7
| | |
* | | Merge pull request #22068 from y-yagi/change_default_to_markdownRafael França2015-12-177-9/+13
|\ \ \ | | | | | | | | README.rdoc -> README.md for newly generated plugins
| * | | README.rdoc -> README.md for newly generated pluginsyuuji.yaginuma2015-12-177-9/+13
| | | | | | | | | | | | | | | | I think Markdown is nowadays a better default.
* | | | Merge pull request #22629 from ↵Rafael França2015-12-171-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/kill-extra-line-in-manifest-js Kill extra newline at the start of generated manifest.js
| * | | | Kill extra newline at the start of generated manifest.jsPrathamesh Sonpatki2015-12-171-1/+0
| | | | |
* | | | | Puma 2.15.3 actually works fineDavid Heinemeier Hansson2015-12-171-1/+1
| |/ / / |/| | |
* | | | Deal with leading CR when its not a mountable engineDavid Heinemeier Hansson2015-12-171-1/+1
| | | |
* | | | Include example of allowed_request_originsDavid Heinemeier Hansson2015-12-171-1/+2
|/ / /