aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24332 from blackchestnut/doc/deprecation_warnSantiago Pastorino2016-04-041-2/+2
|\ | | | | Added 'config.' to deprecation warning
| * Added 'config.' to deprecation warningAlexander Kalinichev2016-03-261-2/+2
| | | | | | | | Misc: `config.public_file_server.enabled = true` instead `public_file_server.enabled = true`
* | Fix rails restart issue with PumaPrathamesh Sonpatki2016-03-307-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We need to pass the restart command to Puma so that it will use it while restarting the server. - Also made sure that all the options passed by user while starting the server are used in the generated restart command so that they will be used while restarting the server. - Besides that we need to remove the server.pid file for the previous running server because otherwise Rack complains about it's presence. - We don't care if the server.pid file does not exist. We only want to delete it if it exists. - This also requires some changes on Puma side which are being tracked here - https://github.com/puma/puma/pull/936. - Fixes #23910.
* | Merge pull request #24325 from ↵Kasper Timm Hansen2016-03-271-3/+4
|\ \ | | | | | | | | | | | | y-yagi/show_correct_command_name_in_help_of_rails_runner show correct command name in help of rails runner
| * | show correct command name in help of rails runneryuuji.yaginuma2016-03-261-3/+4
| | | | | | | | | | | | | | | | | | If use rails together with `spring`, `spring` is rewrite `$0` in the interior command name. Therefore, for `$0` correct command name does not appear, `$0` has been modified so that it does not use.
* | | development.rb file always exists so we don't need a check for itPrathamesh Sonpatki2016-03-261-4/+1
| | |
* | | Merge pull request #24164 from prathamesh-sonpatki/fix-application-mailerRafael França2016-03-231-0/+13
|\ \ \ | |/ / |/| | Correctly generate application_mailer.rb in mountable engines
| * | Correctly generate application_mailer.rb in mountable enginesPrathamesh Sonpatki2016-03-121-0/+13
| | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/24161.
* | | Add ActionCable require statement to pluginKoen Punt2016-03-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating a plugin without ActiveRecord (-O), ActionCable wasn't include, which causes problems with the require action_cable statement in cable.js add active_job require statement also updated order of require statements to match with all.rb
* | | [ci skip] Improve comment minitest plugin initialization.Kasper Timm Hansen2016-03-221-2/+4
| | | | | | | | | | | | | | | Didn't feel we were clear enough about our motivation for placing Rails first and why we needed to call `load_plugins`.
* | | Don't get ahead of ourselves.Kasper Timm Hansen2016-03-221-3/+3
| | | | | | | | | | | | The useless explicit self calls were driving me nuts.
* | | Set Rails as the first minitest initialized plugin.Kasper Timm Hansen2016-03-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling `load_plugins` minitest would fill out its extensions, then we'd tackle ourselves on as the last plugin. Because minitest loads plugins in order we will ultimately have the last say on what reporters will be used. Invert that strategy by putting ourselves first and give other plugins plenty of leeway to override our default reporter setup. Fixes #24179.
* | | Use || instead of `or` as preferred in rails code conventionMarek L2016-03-222-2/+2
| | |
* | | guides, sync railties and AP changelogs with 5.0 release notes.Yves Senn2016-03-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] This updates the 5.0 release notes guide to reflect changes that happened after beta1 has been released. I'll sync the other changelogs later today but I'll push this batch to prevent against cumbersome merge conflicts.
* | | Require enumerable module when using #sumBenjamin Quorning2016-03-221-0/+1
| | | | | | | | | | | | | | | | | | In https://github.com/rails/rails/commit/dfa48f200cbc5c1ca18457a8cde14642e12af5, a call to `#sum` was added. For that to always work, we need to require the core_ext/enumerable module.
* | | Merge pull request #24253 from y-yagi/change_default_value_of_cachingKasper Timm Hansen2016-03-212-2/+3
|\ \ \ | | | | | | | | changed default value of `caching` option to `nil`
| * | | changed default value of `caching` option to `nil`yuuji.yaginuma2016-03-212-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The default is that's false, caching even if you do not specify the caching option is determined not to use, and `tmp/caching-dev.txt` will be deleted. If it is this, regardless of whether or not there is `tmp/caching-dev.txt`, be sure to order would be necessary to specify the caching option, I think that in than good to so as not to do anything by default.
* | | | Merge pull request #24243 from dewski/dont-upgrade-file-watcherArthur Neves2016-03-212-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | Comment out config.file_watcher during Rails upgrade process
| * | | | Add tests for file_watcher config on updateArthur Neves2016-03-211-0/+14
| | | | | | | | | | | | | | | | | | | | [related #24243]
| * | | | Don't upgrade config.file_watcher during upgrade pathGarrett Bjerkhoel2016-03-181-0/+5
| |/ / /
* | | | Fix generator test to match to use the stringRafael Mendonça França2016-03-211-1/+1
| | | |
* | | | Keep all session tests in the same fileRafael Mendonça França2016-03-212-46/+28
| | | |
* | | | Fix request.reset_session for API controllersJon Moss2016-03-191-0/+46
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to that `ActionDispatch::Flash` (the flash API's middleware) is not included for API controllers, the `request.reset_session` method, which relies on there being a `flash=` method which is in fact defined by the middleware, was previously breaking. Similarly to how add46482a540b33184f3011c5c307f4b8e90c9cc created a method to be overridden by the flash middleware in order to ensure non-breakage, this is how flashes are now reset. Fixes #24222
* | | Document and Match the Rails logger interfaceschneems2016-03-161-8/+10
| | | | | | | | | | | | | | | | | | The logger interface to get all Rails features is not obvious. This change adds documentation on how to assign a logger that will use all Rails features. We are also matching the stdout logging interface to the default logger in bootstrap https://github.com/rails/rails/blob/f5a5988352b165143f0f9d622707c351c1470882/railties/lib/rails/application/bootstrap.rb#L42-L45.
* | | Share dev caching implementation between task and server.Kasper Timm Hansen2016-03-153-25/+46
|/ / | | | | | | | | Lets have the server and the Rake task go through the same ropes, so we can share all the file lookup, adding, and deleting code.
* | generate application_mailer.rb if it is missingSen-Zhang2016-03-111-0/+6
| |
* | Remove unfinished command infrastructure.Kasper Timm Hansen2016-03-102-72/+2
| | | | | | | | | | | | | | If we're gonna do this right, it will look mighty different from this anyway. (Looking at you, Rails 5.1). It isn't being used in any code as of now, so yanking is the best option.
* | revises the homepage URL in the gemspecs [ci skip]Xavier Noria2016-03-101-1/+1
| | | | | | | | References https://github.com/rails/homepage/issues/46.
* | prefer require_relative over require + File.expand_pathXavier Noria2016-03-101-1/+1
| |
* | Merge pull request #23940 from prathamesh-sonpatki/rm-with-dispatchersRafael França2016-03-092-14/+15
|\ \ | | | | | | Remove passing `with_dispatchers` to AppGenerator
| * | Remove passing `with_dispatchers` to AppGeneratorPrathamesh Sonpatki2016-03-092-14/+15
| | | | | | | | | | | | | | | | | | | | | - While working on https://github.com/rails/rails/pull/22790 I found out that we pass `with_dispatchers: true` but it's not used at all by Rails. - We were passing `with_dispatchers: true` in few tests too but again it's not used by Rails.
* | | AppGenerator: allow both 'rake' and 'rails'claudiob2016-03-092-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit comes from the comments made by @matthewd at https://github.com/rails/rails/pull/23795/files#r54469637 and by @rafaelfranca at https://github.com/rails/rails/pull/23795/files#r54609364 The idea is that if you type (for example) "rake db:migrate" in an AppGenerator, then this should actually invoke `rake db:migrate` on the command line, whereas if you type "rails_command db:migrate", this should invoke `rails db:migrate`.
* | | Merge pull request #24062 from resure/redundant-escapesRafael França2016-03-082-2/+2
|\ \ \ | | | | | | | | Remove redundant regexp escapes in generators
| * | | Remove redundant regexp escapes in generatorsGadzhi Gadzhiev2016-03-082-2/+2
| | | |
* | | | Merge pull request #24108 from gsamokovarov/web-console-console-plugKasper Timm Hansen2016-03-081-1/+1
|\ \ \ \ | | | | | | | | | | Advertise the console web-console feature
| * | | | Advertise the console web-console featureGenadi Samokovarov2016-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the latest version of Web Console, you can call `console` anywhere in your application and get a console with that binding in it. I think this is worth advertising, as it may be useful to do outside of controllers and views. [ci skip]
* | | | | Fix the tests after e594000Genadi Samokovarov2016-03-081-2/+2
|/ / / /
* / / / Drop the explicit version requirements for web-consoleGenadi Samokovarov2016-03-082-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Between major versions 2 and 3, we hit a bug. It's fixed in version 3, however, the explicit 2.x requirement of `~> '2.0'` will prevent people from getting the fix with `bundle update` and they would have to explicitly set the constraint to `~> '3.0'`. For more information see: rails/web-console#178. I propose we drop the explicit version constraints in the Gemfile. Web Console has been relatively stable for the past couple of years, and I don't anticipate any major alterations, like we saw between major versions 1 and 2.
* | | Merge pull request #23939 from akshaymohite/fix-configuration-tests-semanticsSean Griffin2016-03-071-2/+2
|\ \ \ | | | | | | | | Fixed semantics of couple of tests in the configuration_test.rb [ci skip]
| * | | Fixed couple of semantics in the configuration_test.rbAkshay2016-02-281-2/+2
| |/ /
* | | Merge pull request #24085 from vipulnsward/i18n-test-additionKasper Timm Hansen2016-03-061-1/+7
|\ \ \ | | | | | | | | i18n fallbacks test fixes
| * | | - Added i18n test to verify assigning hash directly to fallbacks instead of ↵Vipul A M2016-03-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | using map - Fixed test name for setting fallbacks to config.i18n.fallbacks = [{ :ca => :'es-ES' }]
* | | | prefer require_relative over require + File.expand_pathXavier Noria2016-03-064-4/+5
| | | | | | | | | | | | | | | | Reads much better doesn't it.
* | | | use __dir__ for relative paths in config/application.rbXavier Noria2016-03-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | use __dir__ for relative paths in config/boot.rbXavier Noria2016-03-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | use __dir__ to load the application in environment.rbXavier Noria2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | use __dir__ to load the environment in config.ruXavier Noria2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | Merge pull request #24070 from ↵Rafael França2016-03-052-13/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/remove_unnecessary_config_in_sprockets-rails-3 remove config that are no longer needed in sprockets-rails 3
| * | | | remove config that are no longer needed in sprockets-rails 3yuuji.yaginuma2016-03-052-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | `config.assets.raise_runtime_errors` and `config.assets.digest` are enabled by default in sprockets-rails 3.
* | | | | define APP_PATH with __dir__Xavier Noria2016-03-051-1/+1
|/ / / / | | | | | | | | | | | | | | | | Defining paths relative to a file name has always hurt my soul, with __dir__ we can restore order in the Universe.