aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23512 from y-yagi/set_association_name_to_fixtureDavid Heinemeier Hansson2016-02-103-11/+10
|\ | | | | set association name to generated fixtures if attribute is reference
| * set association name to generated fixtures if attribute is referenceyuuji.yaginuma2016-02-063-11/+10
| | | | | | | | | | | | | | It has been changed to require `belongs_to` by default in Rails 5. Therefore in order to pass the controller test, have association of set to fixtures. Fixes #23384
* | prevent apps in the railties test suite from running the evented monitorXavier Noria2016-02-101-3/+12
| |
* | include spring-watcher-listen in the Gemfile of new applicationsXavier Noria2016-02-103-0/+9
| |
* | enables the evented monitor in new applicationsXavier Noria2016-02-105-1/+35
| |
* | revert dev:cache to rake task, fixes #23410Scott Bronson2016-02-076-54/+49
| |
* | Remove unused private methodSyamil MJ2016-02-071-4/+0
| |
* | Replace old Rails greeting referencesGenadi Samokovarov2016-02-061-1/+1
|/ | | | | | | A couple of the READMEs were still referring the old welcome page. This is a small change that goes over it. [ci skip]
* Fix mixing line filters with Minitest's -n filter.Kasper Timm Hansen2016-02-052-4/+36
| | | | | | | | | | | Previous commit accidentally broke mixing line filters with string -n filter. Fix by checking if it is a string and returning it. We also need to ensure the -n filter carry forward into any other composite filters. Fix by letting the named filter be extractable, so we'll keep this for the next runnable's run.
* move CHANGELOG entry to the appropriate position [ci skip]yuuji.yaginuma2016-02-051-2/+2
| | | | | Dummy apple icon files has been added after the 5.0.0.beta2 release. ref: #23455
* - app generate option --skip-sprockets leaves jquery-rails gem, which relies ↵Vipul A M2016-02-042-2/+3
| | | | | | | | on sprockets environment - Remove jquery-rails if --skip-sprockets is true Fixes #23431
* Update assertion on redis in generated GemfilePrem Sichanugrist2016-02-041-1/+1
| | | | | | | | Redis now included in Gemfile but commented out. This change was made in 91864439c7aebb6ca710831aac6781903a433904 and is causing the test failure. See https://travis-ci.org/rails/rails/jobs/106994913#L1025
* Merge pull request #23478 from vipulnsward/23470-pass-api-in-update-generatorRafael França2016-02-041-1/+1
|\ | | | | Pass api only option to rails rails:update task to update only based on api Apps
| * Pass api only option to rails rails:update task to update only based on API.Vipul A M2016-02-041-1/+1
| | | | | | | | Fixes #23470
* | Turbolinks has moved outDavid Heinemeier Hansson2016-02-041-1/+1
| | | | | | | | All grown up and shit!
* | Redis is now only needed if you want to use Action Cable in productionDavid Heinemeier Hansson2016-02-041-2/+2
| | | | | | | | So no need to have it on by default in the Gemfile.
* | rake stats dynamically scales nowAkira Matsuda2016-02-041-9/+21
| | | | | | | | So it can properly show stats for an app with 1,000,000+ LOC
* | Revert "Lines of code can be 100,000+ in a Rails app"Akira Matsuda2016-02-041-4/+4
| | | | | | | | | | | | This reverts commit 293bd95c3e77275193130bc14c986348aae8b0e2. This broke the header :<
* | Merge pull request #23458 from kamipo/activerecord_supports_mysql_5.0_and_upSean Griffin2016-02-032-2/+2
|\ \ | | | | | | Active Record supports MySQL >= 5.0
| * | Active Record supports MySQL >= 5.0Ryuta Kamizono2016-02-042-2/+2
| | | | | | | | | | | | | | | Currently some features uses `information_schema` (e.g. foreign key support). `information_schema` introduced since MySQL 5.0.
* | | Merge pull request #23456 from kaspth/line-filter-triggers-one-runnableKasper Timm Hansen2016-02-032-2/+26
|\ \ \ | |/ / |/| | Fix line filters running tests from multiple runnables.
| * | Fix model test path typo uncovered in previous commit.Kasper Timm Hansen2016-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of the expanding whitelist for test filters, this test ended up running the tests on lines 4 and 9 in the post test even though the path wasn't right. Happened incidentally because the same line numbers were used in both account and post test. Add the .rb line so the file is required correctly and the filters are applied.
| * | Fix line filters running tests from multiple runnables.Kasper Timm Hansen2016-02-032-1/+25
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `derive_regexp` was written with the assumption that we were run from a blank slate — that if the filter didn't match we might as well return it because it was nil. This isn't the case because minitest calls `run` on every runnable. Which is any subclass of Minitest::Runnable, such as ActiveSupport::TestCase, ActionDispatch::IntegrationTest as well as any inheriting from those. Thus after the first `run` we'd have put in a composite filter in `options[:filter]` making the next `run` create a linked list when it failed to match the regexp and put the composite filter as the head. Every runnable would accumulate more and more of the same filters, which effectively acted like an expanding whitelist and we ran tests from other runnables. Clog the accumulation by returning nil if there's no filter to derive a regexp from. Note: we pass a seed in the tests because Minitest shuffles the runnables to ensure the whitelist is expanded enough that the failure is triggered.
* / Add dummy apple icon filesAlexey Zabelin2016-02-033-0/+4
|/ | | | | | | | Previously Safari would try to load these files when you visit localhost:3000. That created two exceptions in the log. It also caused the exception notifier to send them out. In response to #23427
* Merge pull request #23447 from y-yagi/update_pg_supported_version_in_docsYves Senn2016-02-032-2/+2
|\ | | | | update supported version of PostgreSQL in docs [ci skip]
| * update supported version of PostgreSQL in docs [ci skip]yuuji.yaginuma2016-02-032-2/+2
| | | | | | | | Follow up to #23434
* | use rails command in routes taskyuuji.yaginuma2016-02-032-10/+10
|/ | | | | For other task has become to use the rails command at doc and test, I think that routes task also it is better to use the rails command.
* Merge pull request #23420 from y-yagi/move_api_test_to_appropriate_fileRafael França2016-02-022-11/+10
|\ | | | | move `test_generator_if_skip_action_cable_is_given_for_an_api_app` to the appropriate file
| * move `test_generator_if_skip_action_cable_is_given_for_an_api_app` to the ↵yuuji.yaginuma2016-02-022-11/+10
| | | | | | | | | | | | appropriate file Test of Rails API should be in `api_app_generator_test.rb`.
* | Generated engines should protect from forgeryAaron Patterson2016-02-012-3/+4
|/ | | | | | Generated engines should call `protect_from_forgery`. If this method isn't called, then the Engine could be susceptible to XSS attacks. Thanks @tomekr for reporting this to us!
* :warning: assigned but unused variable - errAkira Matsuda2016-02-021-2/+2
|
* Add some Action Cable CHANGELOG entriesRafael Mendonça França2016-02-011-3/+1
| | | | | | And improve changelongs. [ci skip]
* Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-012-1/+6
|
* Add spaces in the braces.Kasper Timm Hansen2016-02-011-1/+1
| | | | | | Solves personal insanity, since I was down in these files. (Please don't submit PRs like this.)
* Merge pull request #23225 from vipulnsward/20420-rake-routes-optionsKasper Timm Hansen2016-02-012-4/+91
|\ | | | | Add options for rake routes task
| * Add options for rake routes taskVipul A M2016-02-022-4/+91
| | | | | | | | | | | | | | | | | | | | Add two options: `-c` and `-g`. `-g` option returns the urls name, verb and path fields that match the pattern. `-c` option returns the urls for specific controller. Fixes #18902, and Fixes #20420 [Anton Davydov & Vipul A M]
* | Merge pull request #23398 from matthewd/interlockMatthew Draper2016-02-021-1/+1
|\ \ | | | | | | Address remaining known issues in Interlock
| * | Always obtain the lock and do the unloadMatthew Draper2016-02-021-1/+1
| | | | | | | | | | | | | | | | | | We mostly care about `reload_classes_only_on_change=true`, because that's the default... and there, we definitely need to wait for the lock when necessary.
* | | Merge pull request #23025 from ↵Sean Griffin2016-02-012-3/+3
|\ \ \ | |_|/ |/| | | | | | | | yahonda/shorten_internal_metadata_table_name_less_than_30_byte Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadata
| * | Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadataYasuo Honda2016-02-012-3/+3
| | | | | | | | | | | | to support Oracle database which only supports 30 byte identifier length
* | | Merge pull request #23057 from schneems/schneems/default-puma-configRichard Schneeman2016-02-015-3/+64
|\ \ \ | | | | | | | | Add Default Puma Config
| * | | Add Default Puma Configschneems2016-01-295-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `puma` command is run without any configuration options it will detect presence of a `config/puma.rb` file and use that. Currently there is discrepancy between `puma` command and `rails server` but Evan said it would be reasonable to add in reading in config from the default location. I am working on that right now as a feature in puma/puma. Why do we need this? By default Puma uses 16 threads, and by default ActiveRecord only has 5 threads. Due to the architecture of AR it is guaranteed that if you're running with fewer DB connections than your server has threads you will hit `ActiveRecord::ConnectionTimeoutError ` eventually if your app gets modest amounts of traffic. Since we are providing a default webserver, we should provide reasonable configuration for that webserver. This PR does a few things, first it sets the default Puma thread count to 5 to mach ActiveRecord's default. It sets the default environment to `"development"` and the default port to 300 so that booting the server with `$ puma` will give you the same default port as `rails server`. It is worth mentioning that by reading in from `PORT` environment variable this config can work with containerized deployments, such as on Heroku. We are not using worker processes by default, that way JRuby and windows devs can use this configuration without modification. I went ahead and included a default `on_worker_boot`. It won't be used unless a worker count is specified, that means this config will not use it. Even though it's not being used now It will make someone who wants to try modifying their config to run extra workers easier. cc/ @pixeltrix
* | | | Merge pull request #23385 from matthewd/default-subscription-adapterMatthew Draper2016-02-021-4/+2
|\ \ \ \ | |_|_|/ |/| | | Change default ACa adapter for development & test
| * | | Use the in-process subscription adapter for development & testMatthew Draper2016-02-011-4/+2
| | | |
* | | | Merge pull request #23381 from matthewd/uneventful-redisMatthew Draper2016-02-022-4/+0
|\ \ \ \ | |_|_|/ |/| | | Redis sans EventMachine
| * | | Switch the default redis adapter to a single-stream modelMatthew Draper2016-02-012-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This new adapter does get a little more intimate with the redis-rb gem's implementation than I would like, but it's the least bad of the approaches I've come up with.
* | | | Merge pull request #23169 from y-yagi/rake_proxy_in_engineKasper Timm Hansen2016-01-315-39/+126
|\ \ \ \ | |_|/ / |/| | | make rake proxy work in rails engines
| * | | make rake proxy work in rails enginesyuuji.yaginuma2016-01-315-39/+126
| | | |
* | | | Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-011-0/+3
|/ / /
* / / remove unnecessary gsub for `action_cable_meta_tag`yuuji.yaginuma2016-01-301-1/+0
|/ / | | | | | | | | | | | | If the specified `skip_action_cable` option, so as not to output the `action_cable_meta_tag` in template, gsub is unnecessary. ref: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt#L6..L8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 13:33:17 +0000