Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| | * | Introduce ApplicationRecord, an Active Record layer supertype | Genadi Samokovarov | 2015-12-16 | 7 | -1/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's pretty common for folks to monkey patch `ActiveRecord::Base` to work around an issue or introduce extra functionality. Instead of shoving even more stuff in `ActiveRecord::Base`, `ApplicationRecord` can hold all those custom work the apps may need. Now, we don't wanna encourage all of the application models to inherit from `ActiveRecord::Base`, but we can encourage all the models that do, to inherit from `ApplicationRecord`. Newly generated applications have `app/models/application_record.rb` present by default. The model generators are smart enough to recognize that newly generated models have to inherit from `ApplicationRecord`, but only if it's present. | ||||
| * | | Run railties generated app tests in test env | eileencodes | 2015-12-15 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running railties generated app tests in development env can cause unintended consequences. The environments are different and tests aren't meant to be run in development mode. The changes to the generator exposed this issue where the random test order in the generated apps could cause problems when those tests are run in development mode. Particularly we saw failures in `railties/test/application/rake_test.rb` generated apps that used the scaffold to create applications and then run the migration and immediately run the tests. The error we saw was `ActiveRecord::RecordNotFound: Couldn't find User with 'id'=980190962` and seemed to only occur if the destroy test ran first. I'm not entirely sure _why_ this causes that error to be thrown but I believe it is related to the environments being different. | ||||
| * | | Update test generators to use ActionDispatch::IntegrationTest | Abdelkader Boudih | 2015-12-15 | 8 | -49/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.1 `ActionController::TestCase` will be moved out of Rails into it's own gem. Please use `ActionDispatch::IntegrationTest` going forward. This changes the generators to use `ActionDispatch::IntegrationTest` and the required URL setup (rather than symbols) for each of the controller actions. Updated fix to #22076. | ||||
| * | | Do not default to any Serializer | Santiago Pastorino | 2015-12-15 | 3 | -8/+2 |
| |/ | | | | | | | We will wait until 5.1 to make a decision | ||||
* | | Only include action cable meta tags if it is not skipped | Rafael Mendonça França | 2015-12-16 | 1 | -0/+2 |
| | | |||||
* | | Needless whitespace | David Heinemeier Hansson | 2015-12-16 | 1 | -2/+0 |
| | | |||||
* | | Include the action cable URL meta tag by default | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+3 |
| | | |||||
* | | Assume that the cable server is running in-process by default, offer option ↵ | David Heinemeier Hansson | 2015-12-16 | 1 | -0/+3 |
| | | | | | | | | to change that in config/environments/production.rb | ||||
* | | Fix the engine reference | Rafael Mendonça França | 2015-12-16 | 1 | -1/+1 |
| | | |||||
* | | Doh, should have read ff370ee61754b00f864f3ddd0af62be4dfa0de67 | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 |
| | | | | | | | | Indeed we need this to be an engine for the internal assets to work | ||||
* | | Another bad reference to engine instead of railtie | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 |
| | | |||||
* | | We are using railtie, not engine | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 |
| | | |||||
* | | Accept a Pathname in Application#config_for | Rafael Mendonça França | 2015-12-15 | 2 | -1/+20 |
| | | | | | | | | That would make possible to use it with action cable configuration. | ||||
* | | Merge remote-tracking branch 'origin/master' into merge-action-cable | Rafael Mendonça França | 2015-12-15 | 8 | -31/+31 |
|\| | |||||
| * | Internal test migrations use the private 'Current' version | Matthew Draper | 2015-12-15 | 4 | -15/+15 |
| | | | | | | | | | | | | | | | | Apart from specific versioning support, our tests should focus on the behaviour of whatever version they're accompanying, regardless of when they were written. Application code should *not* do this. | ||||
| * | Ensure generated migrations include a version number | Matthew Draper | 2015-12-15 | 3 | -14/+14 |
| | | |||||
| * | Update seeds.rb.tt | Paul Clegg | 2015-12-14 | 1 | -2/+2 |
| | | | | | | | | Rahm Emanuel doesn't deserve to be in Rails. | ||||
* | | Action Cable need to be a engine | Rafael Mendonça França | 2015-12-15 | 1 | -1/+1 |
| | | | | | | | | Otherwise assets will not work | ||||
* | | Switch from engine to railtie | David Heinemeier Hansson | 2015-12-15 | 1 | -1/+1 |
| | | |||||
* | | Add option to skip Action Cable | Rafael Mendonça França | 2015-12-14 | 3 | -2/+10 |
| | | |||||
* | | Add action_cable to rails/all and application.rb | Rafael Mendonça França | 2015-12-14 | 2 | -9/+11 |
|/ | |||||
* | Revert "Merge pull request #22569 from seuros/remove-test-case" | eileencodes | 2015-12-13 | 9 | -31/+30 |
| | | | | | | | | | This reverts commit 9712a7a12b7f9e4dcef751ceda8a73c3f4beb11f, reversing changes made to 3e65c3d3886336e9145438cdeacaf4ebec6a48b8. Reverting because this caused test failures and while we have a followup branch there is still one failure that happens randomly and isn't straight forward to fix. | ||||
* | Merge pull request #22569 from seuros/remove-test-case | Eileen M. Uchitelle | 2015-12-13 | 9 | -30/+31 |
|\ | | | | | Controller generators should be creating IntegrationTest stubs instea… | ||||
| * | Controller generators should be creating IntegrationTest stubs instead of ↵ | Abdelkader Boudih | 2015-12-13 | 9 | -30/+31 |
| | | | | | | | | ControllerTest | ||||
* | | Merge branch 'rails-rake-proxy' | Kasper Timm Hansen | 2015-12-13 | 3 | -6/+56 |
|\ \ | |||||
| * | | Implement Rake proxy for Rails' command line interface. | Dharam Gollapudi | 2015-12-13 | 3 | -1/+57 |
|/ / | | | | | | | | | | | | | Allows any Rake task to be run through `bin/rails` such as `bin/rails db:migrate`, `bin/rails notes` etc. The Rake tasks are appended to Rails' help output, and blend in as standard commands. | ||||
* | | Merge pull request #22574 from gsamokovarov/scaffold-500 | Kasper Timm Hansen | 2015-12-13 | 3 | -3/+3 |
|\ \ | | | | | | | Prevent a 500 in the default controller scaffold | ||||
| * | | Prevent a 500 in the default controller scaffold | Genadi Samokovarov | 2015-12-13 | 3 | -3/+3 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you update a record with no attributes, you'll hit a 500 from a guard in `assign_attributes` raising: ```ruby ArgumentError: When assigning attributes, you must pass a hash as an argument. app/controllers/users_controller.rb:44:in `block in update' app/controllers/users_controller.rb:43:in `update' test/controllers/users_controller_test.rb:37:in `block in <class:UsersControllerTest>' ``` Not a biggie, but may be quite confusing for the folks new to the framework. | ||||
* | | Merge pull request #22573 from gsamokovarov/web-console-3-0 | Kasper Timm Hansen | 2015-12-13 | 2 | -3/+3 |
|\ \ | | | | | | | Update web-console to 3.0.0 |