aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* Fix testsDavid Heinemeier Hansson2015-12-171-2/+0
|
* Don't mount the ActionCable server by defaultDavid Heinemeier Hansson2015-12-172-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 ApplicationRecordDavid Heinemeier Hansson2015-12-161-1/+0
|
* Fix testDavid Heinemeier Hansson2015-12-161-1/+10
|
* No need to check for pumaRafael Mendonça França2015-12-161-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 tooDavid Heinemeier Hansson2015-12-161-1/+1
|
* Avoid Action Cable stubs on --skip-action-cableDavid Heinemeier Hansson2015-12-163-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.rbDavid Heinemeier Hansson2015-12-161-1/+0
|
* Generate all the ApplicationCable stubs by default, like all other ↵David Heinemeier Hansson2015-12-165-1/+20
| | | | Application* stubs
* Saner incrementsDavid Heinemeier Hansson2015-12-161-3/+3
|
* Use puma as the default development server, if availableDavid Heinemeier Hansson2015-12-162-4/+4
|
* Eager loading is required for Action Cable and we should use the logging tooDavid Heinemeier Hansson2015-12-161-0/+4
|
* Only mount the ActionCable server if ApplicationCable has been definedDavid Heinemeier Hansson2015-12-161-1/+1
|
* By default, mount Action Cable on the routerDavid Heinemeier Hansson2015-12-161-0/+3
|
* Add default redis config for Action CableDavid Heinemeier Hansson2015-12-162-0/+9
|
* Merge branch 'master' into merge-action-cableRafael Mendonça França2015-12-1620-69/+102
|\
| * Use sprockets 3 in the Rails 5 releaseRafael Mendonça França2015-12-163-8/+7
| |
| * Merge pull request #22567 from gsamokovarov/introduce-application-recordRafael França2015-12-167-1/+29
| |\ | | | | | | Introduce ApplicationRecord, an Active Record layer supertype
| | * Introduce ApplicationRecord, an Active Record layer supertypeGenadi Samokovarov2015-12-167-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 enveileencodes2015-12-151-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::IntegrationTestAbdelkader Boudih2015-12-158-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 SerializerSantiago Pastorino2015-12-153-8/+2
| |/ | | | | | | We will wait until 5.1 to make a decision
* | Only include action cable meta tags if it is not skippedRafael Mendonça França2015-12-161-0/+2
| |
* | Needless whitespaceDavid Heinemeier Hansson2015-12-161-2/+0
| |
* | Include the action cable URL meta tag by defaultDavid Heinemeier Hansson2015-12-161-1/+3
| |
* | Assume that the cable server is running in-process by default, offer option ↵David Heinemeier Hansson2015-12-161-0/+3
| | | | | | | | to change that in config/environments/production.rb
* | Fix the engine referenceRafael Mendonça França2015-12-161-1/+1
| |
* | Doh, should have read ff370ee61754b00f864f3ddd0af62be4dfa0de67David Heinemeier Hansson2015-12-161-1/+1
| | | | | | | | Indeed we need this to be an engine for the internal assets to work
* | Another bad reference to engine instead of railtieDavid Heinemeier Hansson2015-12-161-1/+1
| |
* | We are using railtie, not engineDavid Heinemeier Hansson2015-12-161-1/+1
| |
* | Accept a Pathname in Application#config_forRafael Mendonça França2015-12-152-1/+20
| | | | | | | | That would make possible to use it with action cable configuration.
* | Merge remote-tracking branch 'origin/master' into merge-action-cableRafael Mendonça França2015-12-158-31/+31
|\|
| * Internal test migrations use the private 'Current' versionMatthew Draper2015-12-154-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 numberMatthew Draper2015-12-153-14/+14
| |
| * Update seeds.rb.ttPaul Clegg2015-12-141-2/+2
| | | | | | | | Rahm Emanuel doesn't deserve to be in Rails.
* | Action Cable need to be a engineRafael Mendonça França2015-12-151-1/+1
| | | | | | | | Otherwise assets will not work
* | Switch from engine to railtieDavid Heinemeier Hansson2015-12-151-1/+1
| |
* | Add option to skip Action CableRafael Mendonça França2015-12-143-2/+10
| |
* | Add action_cable to rails/all and application.rbRafael Mendonça França2015-12-142-9/+11
|/
* Revert "Merge pull request #22569 from seuros/remove-test-case"eileencodes2015-12-139-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-caseEileen M. Uchitelle2015-12-139-30/+31
|\ | | | | Controller generators should be creating IntegrationTest stubs instea…
| * Controller generators should be creating IntegrationTest stubs instead of ↵Abdelkader Boudih2015-12-139-30/+31
| | | | | | | | ControllerTest
* | Merge branch 'rails-rake-proxy'Kasper Timm Hansen2015-12-133-6/+56
|\ \