aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-templateRafael França2016-01-294-2/+42
|\ \ | | | | | | Add an after_bundle callback in Rails plugin templates
| * | Implemented pull request changes.Ryan Manuel2016-01-291-7/+5
| | |
| * | Update doc with appropriate issue and pull request versionsRyan Manuel2016-01-281-1/+1
| | |
| * | Add an after_bundle callback in Rails plugin templatesRyan Manuel2016-01-284-2/+44
| | |
* | | Revert "Revert "Eliminate the EventMachine dependency""Matthew Draper2016-01-301-2/+1
| | |
* | | Merge pull request #23220 from maclover7/fix-23215Richard Schneeman2016-01-281-6/+0
|\ \ \ | |/ / |/| | Remove empty lines in Rails development logger
| * | Remove empty lines in Rails development loggerJon Moss2016-01-241-6/+0
| | | | | | | | | | | | | | | | | | This is causing bugs like #23215 to occur, due to the extra spaces being inserted. Also, this is fixed upstream in the upcoming release of Sprockets 4.
* | | Merge pull request #23237 from gsamokovarov/new-welcome-pageDavid Heinemeier Hansson2016-01-283-268/+65
|\ \ \ | | | | | | | | Introduce new welcome page for new projects
| * | | Introduce new welcome page for new projectsGenadi Samokovarov2016-01-263-268/+65
| | | | | | | | | | | | | | | | As requested by David in 23233.
* | | | Revert "Eliminate the EventMachine dependency"David Heinemeier Hansson2016-01-271-1/+2
| | | |
* | | | [ci skip] Don’t explicitly mention EventMachineclaudiob2016-01-252-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #23152 eliminated the EventMachine dependency, we don’t need to explicitly mention EventMachine. Nevertheless, I'm not 100% sure about saying "the websocket-driver loop" driver… any suggestions, @matthewd or @pixeltrix ? :sweat_smile: [ci skip]
* | | Merge branch '5-0-beta-sec'Aaron Patterson2016-01-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 5-0-beta-sec: bumping version fix version update task to deal with .beta1.1 Eliminate instance level writers for class accessors allow :file to be outside rails root, but anything else must be inside the rails view directory Don't short-circuit reject_if proc stop caching mime types globally use secure string comparisons for basic auth username / password
| * | | bumping versionAaron Patterson2016-01-251-1/+1
| | | |
* | | | Merge pull request #23212 from vipulnsward/bin-railsKasper Timm Hansen2016-01-249-95/+96
|\ \ \ \ | | | | | | | | | | Be consistent in testing outputs from railties test and use /bin/rails
| * | | | Be consistent in testing outputs from railties test and use /bin/rails ↵Vipul A M2016-01-249-95/+96
| | |/ / | |/| | | | | | | | | | | | | | | | | | everywhere(the default behaviour now) instead of mix of /bin/rake /bin/rails everywhere [Ryo Hashimoto & Vipul A M]
* | | | Merge pull request #23152 from matthewd/actioncable-concurrentDavid Heinemeier Hansson2016-01-241-2/+1
|\ \ \ \ | | | | | | | | | | Eliminate the EventMachine dependency
| * | | | Ditch the EM error logging helperMatthew Draper2016-01-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're no longer doing our work in the EM event loop, so errors are quite unlikely, and if they do occur, they're not really our responsibility to handle.
* | | | | Pare back default `index` option for the migration generatorPrathamesh Sonpatki2016-01-244-32/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Using `references` or `belongs_to` in migrations will always add index for the referenced column by default, without adding `index:true` option to generated migration file. - Users can opt out of this by passing `index: false`. - Legacy migrations won't be affected by this change. They will continue to run as they were before. - Fixes #18146
* / / / Rails::Generators::Actions#gem should work even if frozen string is passed ↵Prathamesh Sonpatki2016-01-242-1/+9
|/ / / | | | | | | | | | | | | | | | as argument - Fixes #23137.
* | / prevent --skip-action-cable from erroring when --api option is usedDave Riddle2016-01-222-1/+13
| |/ |/|
* | remove `per_form_csrf_tokens` initializer from Rails APIyuuji.yaginuma2016-01-222-0/+2
| | | | | | | | | | Because the form is not in the Rails API, `per_form_csrf_tokens` initializer I think unnecessary.
* | Merge pull request #23174 from JuanitoFatas/followup-skip-action-cableKasper Timm Hansen2016-01-222-0/+4
|\ \ | | | | | | Remove action_cable_meta_tag when skip Action Cable
| * | Remove action_cable_meta_tag when skip action_cableJuanitoFatas2016-01-222-0/+4
| | |
* | | Add `config/cable.yml` to list of default files in Rails generatorJon Moss2016-01-211-0/+1
|/ /
* | Merge pull request #23078 from ↵Rafael França2016-01-214-1/+12
|\ \ | | | | | | | | | | | | y-yagi/add_application_mailer_rb_to_mountable_engine add application_mailer.rb to template of mountable engine
| * | allow symbol to end of string in `wrap_in_modules`yuuji.yaginuma2016-01-162-5/+5
| | |
| * | add application_mailer.rb to template of mountable engineyuuji.yaginuma2016-01-153-0/+11
| | | | | | | | | | | | | | | since 9446e38ba47c9ca3be2ad668d8a8bea0141be6fc, generated mailer inherents from ApplicationMailer, ApplicationMailer is required in the mountable engine.
* | | updating secrets.yml template to use rails command instead of rakeDiego Plentz2016-01-211-1/+1
| | |
* | | Merge pull request #22950 from maclover7/adapterize-storage-actioncableMatthew Draper2016-01-205-12/+35
|\ \ \ | | | | | | | | | | | | Adapterize storage for ActionCable
| * | | Add em-hiredis and redis as default Gems for new applicationsJon Moss2016-01-182-0/+20
| | | |
| * | | Adapterize ActionCable storage and extract behaviorJon Moss2016-01-184-12/+15
| | | |
* | | | Remove incomplete filter runs all tests in plugins.Kasper Timm Hansen2016-01-181-8/+0
| | | | | | | | | | | | | | | | Forgot to remove it, when I changed the expectations in 88881d2.
* | | | Don't run all tests when files end in a colon.Kasper Timm Hansen2016-01-182-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If running `bin/rails t test/models/bunny_test.rb:` we'd implicitly run all the tests in the bunny test. I now highly doubt that people would ever put in a line filter without a line *and* want that to mean run all tests in that file. Instead, change regex to require a line digit after the colon, so runs without a line at the end would fail to require the test file. This also has the side benefit of breaking requiring a file with many colons: `bin/rails t test/models/bunny_test.rb:::::::::::::4` Think this means I've had enough colonoscopy to last me through the year :)
* | | | Merge pull request #23006 from Edouard-chin/code_statistic_ignore_hidde_filesKasper Timm Hansen2016-01-182-2/+15
|\ \ \ \ | |/ / / |/| | | CodeStatistic will now ignore hidden files:
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 22:09:42 +0000