aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'actionmailer-cache'Rafael Mendonça França2016-02-243-0/+12
|\ | | | | | | | | | | This is a rebased version of #22825. Closes #22825.
| * Change ActionMailer's default caching configuration and update generator's ↵Stan Lo2016-02-233-0/+12
| | | | | | | | environment templates
* | Use the trick to get beta releases in the GemfileRafael Mendonça França2016-02-231-1/+1
| |
* | New apps get the Turbolinks beta gemSam Stephenson2016-02-231-2/+2
| |
* | Switch to `data-turbolinks-track="reload"`Sam Stephenson2016-02-231-2/+2
|/
* Merge pull request #23734 from schneems/schneems/stdout-againRichard Schneeman2016-02-231-0/+4
|\ | | | | Alternative to #23638 log to STDOUT via env var
| * Alternative to #23638 log to STDOUT via env varschneems2016-02-171-0/+4
| | | | | | | | | | | | People who deploy to containers or other places where they might have some sort of a log wrapping service use stdout. With this change new rails apps can be configured to output to STDOUT via setting `RAILS_LOG_TO_STDOUT` to any value. This allows container images or services to set the value for all apps without having to modify configuration for each application. If an app wants to opt out, they can either delete from the env hash, or remove that configuration. cc/ @rafaelfranca
* | Merge pull request #23669 from maclover7/internal-routesRafael França2016-02-221-4/+4
|\ \ | | | | | | Add `internal` attribute to routes
| * | Add `internal` attribute to routesJon Moss2016-02-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant to provide a way for Action Cable, Sprockets, and possibly other Rack applications to mark themselves as internal, and to exclude themselves from the routing inspector, and thus `rails routes` / `rake routes`. I think this is the only way to have mounted Rack apps be marked as internal, within AD/Journey. Another option would be to create an array of regexes for internal apps, and then to iterate over that everytime a request comes through. Also, I only had the first `add_route` method set `internal`'s default to false, to avoid littering it all over the codebase.
* | | Generate `config/cable.yml` in `rails:update` commandJon Moss2016-02-221-0/+5
|/ /
* | make sure `rake test` respects TESTOPTSAaron Patterson2016-02-221-1/+2
| | | | | | | | | | We should be able to pass options to minitest via TESTOPTS environment variable
* | [ci skip] Mention testing fore-runners.Kasper Timm Hansen2016-02-211-0/+2
| | | | | | | | Get it? ( ͡° ͜ʖ ͡°)
* | use method provided by minitestyuuji.yaginuma2016-02-211-7/+1
| | | | | | | | | | | | | | The process of converting `Test` to `String` is already defined in minitest. I think it is better to use that for the consistency of output content. ref: https://github.com/seattlerb/minitest/blob/master/lib/minitest/test.rb#L261..L267
* | set `skip_listen` option to dummy appplicationyuuji.yaginuma2016-02-181-0/+1
| | | | | | | | | | | | If you want to use `EventedFileUpdateChecker`, need to specify `listen` to plugin's gemspec. However, the default is not specified `listen` to plugin's gemspec, `EventedFileUpdateChecker` should be disabled.
* | Merge pull request #23730 from y-yagi/fail_fast_when_test_errorAndrew White2016-02-172-2/+2
|\ \ | |/ |/| modify to `error` also abort when specify fail fast option
| * modify to `error` also abort when specify fail fast optionyuuji.yaginuma2016-02-172-2/+2
| |
* | remove unused methodyuuji.yaginuma2016-02-171-4/+0
|/ | | | `app_templates_dir` is unused since dc53fe9.
* adds --skip-listen to the application generator [closes #23590]Xavier Noria2016-02-173-3/+10
|
* Merge pull request #23631 from y-yagi/generate_mailer_views_in_apiYves Senn2016-02-152-3/+7
|\ | | | | generate mailer views in Rails API
| * generate mailer views in Rails APIyuuji.yaginuma2016-02-152-3/+7
| | | | | | | | | | View files is necessary to send mail, it should be generated even Rails API. Fixes #23617
* | test runner, relay minitest information about the error location.Yves Senn2016-02-151-1/+1
| | | | | | | | | | This is a follow-up to ea70c29 to bring back the assertion error location information provided by minitest.
* | Revert "Prefer Minitest's location for test failures."Yves Senn2016-02-151-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0db310586ac3e15be95d2ef27ff40cfa24c05c10. Closes #23686. Conflicts: railties/test/application/test_runner_test.rb It's possible that the `result.location` returned by minitest is outside the test file itself. For example in the case of mocha. This resulted in bad rerun snipptets: ``` bin/rails test app/models/deliveries/delivery.rb:103 ``` Let's always use the first line of the failed test-case in our rerun snippet. We can display the line number of the assertion error elsewhere.
* | Merge pull request #23569 from Gaurav2728/no_doc_of_some_railtie_methodsVipul A M2016-02-151-4/+7
|\ \ | | | | | | mark as #:nodoc: [ci skip]
| * | mark as #:nodoc: [ci skip]Gaurav Sharma2016-02-151-4/+7
| | | | | | | | | can’t be instantiate directly or may be no need for doc.
* | | Merge pull request #23664 from y-yagi/remove_test_order_from_environment_fileYves Senn2016-02-151-3/+0
|\ \ \ | |/ / |/| | remove `active_support.test_order` from environment file
| * | remove `active_support.test_order` from environment fileyuuji.yaginuma2016-02-141-3/+0
| | | | | | | | | | | | | | | The default test order has been changed to `:random` in 5f777e4b5ee2e3e8e6fd0e2a208ec2a4d25a960d. Therefore, it is no more need to be specified in the environment file.
* | | Merge pull request #23505 from kaspth/inject-rails-config-through-railtieKasper Timm Hansen2016-02-141-0/+1
|\ \ \ | |/ / |/| | Inject Rails related configuration through Railtie
| * | Inject Rails' channel paths in engine.Kasper Timm Hansen2016-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were explicitly referencing Rails.root in ActionCable::Server::Configuration.initialize, thereby coupling ourselves to Rails. Instead add `app/channels` to Rails' app paths and assign the existent files to `channel_paths`. Users can still append to those load paths with `<<` and `push` in `config/application.rb`. This means we can remove the custom `Dir` lookup in `channel_paths` and the Rails and root definitions in the tests.
* | | Use Ruby 1.9 hash syntaxRafael Mendonça França2016-02-121-1/+1
| | |
* | | Use correct path in documentation.Tom von Schwerdtner2016-02-121-1/+1
| | | | | | | | | | | | | | | | | | s/config\/production/config\/environments\/production/ [ci skip]
* | | - Fixed and removed long arguments to rake routesVipul A M2016-02-121-3/+3
| |/ |/| | | | | | | | | - Fixed related documentation and usage all around Fixes #23561
* | Merge pull request #23528 from bensheldon/patch-1Richard Schneeman2016-02-101-1/+1
|\ \ | | | | | | Set database poolsize via rails_max_threads
| * | Set postgresql poolsize via RAILS_MAX_THREADSBen Sheldon2016-02-101-1/+1
| |/
* | Merge pull request #23512 from y-yagi/set_association_name_to_fixtureDavid Heinemeier Hansson2016-02-101-1/+1
|\ \ | | | | | | set association name to generated fixtures if attribute is reference
| * | set association name to generated fixtures if attribute is referenceyuuji.yaginuma2016-02-061-1/+1
| |/ | | | | | | | | | | | | 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
* | include spring-watcher-listen in the Gemfile of new applicationsXavier Noria2016-02-101-0/+3
| |
* | enables the evented monitor in new applicationsXavier Noria2016-02-103-1/+8
| |
* | revert dev:cache to rake task, fixes #23410Scott Bronson2016-02-074-22/+15
| |
* | Remove unused private methodSyamil MJ2016-02-071-4/+0
|/
* Fix mixing line filters with Minitest's -n filter.Kasper Timm Hansen2016-02-051-4/+12
| | | | | | | | | | | 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.
* - app generate option --skip-sprockets leaves jquery-rails gem, which relies ↵Vipul A M2016-02-041-1/+1
| | | | | | | | on sprockets environment - Remove jquery-rails if --skip-sprockets is true Fixes #23431
* 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-031-1/+1
|\ \ \ | |/ / |/| | Fix line filters running tests from multiple runnables.