Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22657 from matthewd/loosen-version | Rafael Mendonça França | 2015-12-18 | 4 | -3/+32 |
|\ | | | | | | | Allow normal version updates within a release series | ||||
| * | Allow normal version updates within a release series | Matthew Draper | 2015-12-18 | 4 | -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 places | David Heinemeier Hansson | 2015-12-18 | 1 | -1/+1 |
| | | | | | | | | Still more to do. Please assist! | ||||
* | | Explain reason for eager loading | David Heinemeier Hansson | 2015-12-18 | 1 | -0/+1 |
| | | |||||
* | | Explain Redis' role in Action Cable | David Heinemeier Hansson | 2015-12-18 | 1 | -0/+1 |
| | | |||||
* | | Bring comment in line with rest of initializers | David Heinemeier Hansson | 2015-12-18 | 1 | -2/+2 |
| | | |||||
* | | Explain the concept of config initializers for backwards compatibility | David Heinemeier Hansson | 2015-12-18 | 3 | -2/+5 |
| | | |||||
* | | Fix spacing | David Heinemeier Hansson | 2015-12-18 | 1 | -1/+1 |
| | | |||||
* | | These options are not changed nearly often enough to warrant inclusion like ↵ | David Heinemeier Hansson | 2015-12-18 | 1 | -8/+0 |
| | | | | | | | | this at a high level | ||||
* | | Better explanation | David Heinemeier Hansson | 2015-12-18 | 1 | -2/+6 |
| | | |||||
* | | Use the rails command, not rake, for all rails commands | David Heinemeier Hansson | 2015-12-18 | 2 | -6/+6 |
| | | |||||
* | | README.md in the app is now used to describe the app itself, not Rails | David Heinemeier Hansson | 2015-12-18 | 1 | -1/+0 |
| | | |||||
* | | More sensible ordering with the more important options first | David Heinemeier Hansson | 2015-12-18 | 1 | -12/+12 |
| | | |||||
* | | List the major frameworks you can remove together | David Heinemeier Hansson | 2015-12-18 | 1 | -3/+3 |
| | | |||||
* | | fix indentation of generated controller test | yuuji.yaginuma | 2015-12-18 | 2 | -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 file | Akira Matsuda | 2015-12-18 | 1 | -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 rack | Rafael Mendonça França | 2015-12-18 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #22642 from seuros/remove-mysql-adapter | Matthew Draper | 2015-12-18 | 1 | -3/+3 |
|\ | | | | | | | Remove legacy mysql adapter | ||||
| * | Remove legacy mysql adapter | Abdelkader Boudih | 2015-12-17 | 1 | -3/+3 |
| | | |||||
* | | Use release sprockets-rails | Rafael Mendonça França | 2015-12-17 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #22627 from rails/application-mailer-by-default | Rafael França | 2015-12-17 | 12 | -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 Hansson | 2015-12-17 | 11 | -41/+28 |
| | | | | | | | | | | | | Application* parent | ||||
| * | | Fix warning | Rafael Mendonça França | 2015-12-17 | 1 | -1/+1 |
| |/ | |||||
* / | Use released arel | Rafael Mendonça França | 2015-12-17 | 1 | -1/+0 |
|/ | |||||
* | Generate API doc for actioncable | Arun Agrawal | 2015-12-17 | 1 | -0/+7 |
| | |||||
* | Merge pull request #22068 from y-yagi/change_default_to_markdown | Rafael França | 2015-12-17 | 7 | -9/+13 |
|\ | | | | | README.rdoc -> README.md for newly generated plugins | ||||
| * | README.rdoc -> README.md for newly generated plugins | yuuji.yaginuma | 2015-12-17 | 7 | -9/+13 |
| | | | | | | | | I think Markdown is nowadays a better default. | ||||
* | | Merge pull request #22629 from ↵ | Rafael França | 2015-12-17 | 1 | -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.js | Prathamesh Sonpatki | 2015-12-17 | 1 | -1/+0 |
| | | | |||||
* | | | Puma 2.15.3 actually works fine | David Heinemeier Hansson | 2015-12-17 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Deal with leading CR when its not a mountable engine | David Heinemeier Hansson | 2015-12-17 | 1 | -1/+1 |
| | | |||||
* | | Include example of allowed_request_origins | David Heinemeier Hansson | 2015-12-17 | 1 | -1/+2 |
|/ | |||||
* | Fix tests | David Heinemeier Hansson | 2015-12-17 | 1 | -2/+0 |
| | |||||
* | Don't mount the ActionCable server by default | David Heinemeier Hansson | 2015-12-17 | 2 | -2/+2 |
| | | | | | | Since we require you to enable it on the client-side, let us do the same on the server-side. Then you’re not running an EventMachine unless you need to. | ||||
* | No longer uses keep now that we have ApplicationRecord | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+0 |
| | |||||
* | Fix test | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+10 |
| | |||||
* | No need to check for puma | Rafael Mendonça França | 2015-12-16 | 1 | -1/+1 |
| | | | | Rack::Server already does it work for us if the server is installed. | ||||
* | Fix test now that cable is in there by default too | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 |
| | |||||
* | Avoid Action Cable stubs on --skip-action-cable | David Heinemeier Hansson | 2015-12-16 | 3 | -3/+7 |
| | | | | | Still missing the stuff in app/ – we need to basically switch from a * match to specifically picking out what we need. | ||||
* | No longer needed now that we prefill with app/models/application_record.rb | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+0 |
| | |||||
* | Generate all the ApplicationCable stubs by default, like all other ↵ | David Heinemeier Hansson | 2015-12-16 | 5 | -1/+20 |
| | | | | Application* stubs | ||||
* | Saner increments | David Heinemeier Hansson | 2015-12-16 | 1 | -3/+3 |
| | |||||
* | Use puma as the default development server, if available | David Heinemeier Hansson | 2015-12-16 | 2 | -4/+4 |
| | |||||
* | Eager loading is required for Action Cable and we should use the logging too | David Heinemeier Hansson | 2015-12-16 | 1 | -0/+4 |
| | |||||
* | Only mount the ActionCable server if ApplicationCable has been defined | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 |
| | |||||
* | By default, mount Action Cable on the router | David Heinemeier Hansson | 2015-12-16 | 1 | -0/+3 |
| | |||||
* | Add default redis config for Action Cable | David Heinemeier Hansson | 2015-12-16 | 2 | -0/+9 |
| | |||||
* | Merge branch 'master' into merge-action-cable | Rafael Mendonça França | 2015-12-16 | 20 | -69/+102 |
|\ | |||||
| * | Use sprockets 3 in the Rails 5 release | Rafael Mendonça França | 2015-12-16 | 3 | -8/+7 |
| | | |||||
| * | Merge pull request #22567 from gsamokovarov/introduce-application-record | Rafael França | 2015-12-16 | 7 | -1/+29 |
| |\ | | | | | | | Introduce ApplicationRecord, an Active Record layer supertype |