aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Fix and optimize scaffold CSS [ci skip]Andrii Ponomarov2016-05-221-8/+4
|
* Merge pull request #24170 from maclover7/fix-24168Rafael França2016-05-211-2/+1
|\ | | | | Un-hide helper and assets options for controller generator
| * Un-hide helper and assets options for controller generatorJon Moss2016-03-121-2/+1
| | | | | | | | | | | | | | | | These options were hidden via 9b36cf0fa4cbdcb2e2072ef1b8179a98b13efce3, but these options have tests written for them, and I believe that they are supposed to be public API. Fixes #24168.
* | Added a shared section to config/secrets.yml that will be loaded for all ↵David Heinemeier Hansson2016-05-212-3/+16
| | | | | | | | environments
* | Cable: Generate .js or .coffee files while generating channel as per the ↵Prathamesh Sonpatki2016-05-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javascript engine of the application - Now we will detect what javascript engine user is using and based on that we will generate either `.js` or `.coffee` version of the channel file. - This also needs a change in coffee-rails to override the `js_template` method. Related PR https://github.com/rails/coffee-rails/pull/72. - Currently coffee-rails gem sets `config.app_generators.javascript_engine` to `:coffee` and using this information we override the `js_template` to set the extension as `.coffee` in coffee-rails gem. - Using this approach, we can keep the `channel.js` and `channel.coffee` files in the Rails repository itself. - Additionally the `js_template` method can act as public interface for coffee-rails gem to hook into and change the extension to `.coffee` without maintaining the actual asset files. [Prathamesh Sonpatki, Matthew Draper]
* | reorder env keys in the generated config/cable.ymlXavier Noria2016-05-151-5/+4
| | | | | | | | Conventionally envs are ordered development -> test -> production.
* | Use sass-rails and coffee-rails that work with Rails 5.1Rafael Mendonça França2016-05-101-2/+2
| |
* | Start Rails 5.1 development :tada:Rafael Mendonça França2016-05-101-2/+2
| |
* | Preparing for 5.0.0.rc1 releaseRafael Mendonça França2016-05-061-1/+1
| |
* | Fix some typos in comments.Joe Rafaniello2016-05-041-1/+1
| | | | | | | | [ci skip]
* | Prep Rails 5 beta 4eileencodes2016-04-271-1/+1
| |
* | Merge pull request #24696 from y-yagi/remove_unnessary_option_settingKasper Timm Hansen2016-04-252-5/+5
|\ \ | | | | | | remove unnessary option setting from test runner
| * | register rake options to `OptionParser`yuuji.yaginuma2016-04-251-0/+3
| | | | | | | | | | | | | | | In order to prevent `OptionParser::ParseError` when specify the rake options to `routes` task.
| * | remove unnessary option setting from test runneryuuji.yaginuma2016-04-251-5/+2
| | | | | | | | | | | | | | | | | | | | | If run the test over the `rake` command, because of the test patterns is passed via `rake_run` method, do not need to be obtained from the argv. This probably fixes #24372.
* | | removes useless use of string interpolationXavier Noria2016-04-241-2/+2
| | | | | | | | | | | | `railtie` is already a string!
* | | add channels files in `stats` taskyuuji.yaginuma2016-04-241-0/+1
| | |
* | | Add compatibility for Ruby 2.4 `to_time` changesAndrew White2016-04-232-0/+15
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4 the `to_time` method for both `DateTime` and `Time` will preserve the timezone of the receiver when converting to an instance of `Time`. Since Rails 5.0 will support Ruby 2.2, 2.3 and later we need to introduce a compatibility layer so that apps that upgrade do not break. New apps will have a config initializer file that defaults to match the new Ruby 2.4 behavior going forward. For information about the changes to Ruby see: https://bugs.ruby-lang.org/issues/12189 https://bugs.ruby-lang.org/issues/12271 Fixes #24617.
* | Merge pull request #24664 from ↵Rafael França2016-04-211-1/+1
|\ \ | | | | | | | | | | | | y-yagi/use_wrapper_file_to_add_rake_task_for_engines use wrapper file to add rake task for engines
| * | use wrapper file to add rake task for enginesyuuji.yaginuma2016-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `bundler` provides wrapper file to add rask tasks. https://github.com/bundler/bundler/blob/master/lib/bundler/gem_tasks.rb Instead of directly call method, by which require this file, it can be used without updating of Rakefile if task has been added.
* | | use rails command in `time:zones` task desc [ci skip]yuuji.yaginuma2016-04-201-1/+1
|/ /
* | Merge pull request #20625 from Envek/add_country_zones_methodJeremy Daer2016-04-191-6/+23
|\ \ | | | | | | | | | Add ActiveSupport::TimeZone.country_zones helper
* | | mention rails 5 instead of rails 4 in bin/rails for pluginsBen A. Morgan2016-04-191-1/+2
|/ /
* | removes unneeded require in rails/railtie.rbXavier Noria2016-04-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Railties' `config` method instatiates a Rails::Railtie::Configuration object. Rails::Configuration is not used in this file. The patch does not replace the file being required with the one for Rails::Railtie::Configuration because that one is autoloaded. See the spot where this patch changes double quotes with single quotes. Rails::Railtie::Configuration does depend on Rails::Configuration, and it requires it accordingly.
* | Merge pull request #24490 from ↵Santiago Pastorino2016-04-111-3/+3
|\ \ | | | | | | | | | | | | prathamesh-sonpatki/add-config-to-deprecation-warning Add `config` to the deprecation warnings of deprecated config options
| * | Add `config` to the deprecation warnings of deprecated config optionsPrathamesh Sonpatki2016-04-101-3/+3
| | |
* | | edit pass over the RDoc of Rails::Railtie [ci skip]Xavier Noria2016-04-111-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pass touches a few minor things. One important aspect is that the wording treats "railtie" as a regular noun. This is so because Railtie is a constant and generally the text refers to "classes that act as railties", which is different. Railties are so fundamental in Rails that deserve a noun, like engine, class, array, application, etc. They have a meaning per se, beyond constants. Also, make clear an extension's railtie does not need to be called "Railtie" or have "Railtie" in their class name.
* | | remove explicit curlies for hash argumentXavier Noria2016-04-111-2/+2
| | | | | | | | | | | | | | | Idiomatically trailing hashes in method calls do not use explicit curlies.
* | | issue FileUtils commands directly in Rake tasksXavier Noria2016-04-113-14/+11
| | | | | | | | | | | | | | | Rake includes (an extended version of) FileUtils in tasks. It is more idiomatic that they use this provided interface.
* | | revises fileutils dependencies in railtiesXavier Noria2016-04-118-4/+13
|/ / | | | | | | | | | | With the exception of what is loaded in active_support/rails, each file is responsible for its own dependencies. You cannot rely on runtime order of execution.
* | do not create unnecessary directoryyuuji.yaginuma2016-04-101-3/+1
| | | | | | | | | | | | This was added in a4c358f, but `config.assets` has been removed in 5172d93. Also, do not use env path to `Sprockets::Cache::FileStore` even `sprockets-rails`. ref: https://github.com/rails/sprockets-rails/blob/master/lib/sprockets/railtie.rb#L129
* | Use new hash syntax (#24464)Jeroen Visser2016-04-081-2/+2
| | | | | | | | | | | | * Updated syntax * Updated tests to match syntax
* | Merge pull request #24335 from mabras/masterRafael França2016-04-071-2/+0
|\ \ | | | | | | remove unused `require`
| * | remove unused requireMohamad Abras2016-03-291-2/+0
| | |
* | | Directly support stateful executor hooksMatthew Draper2016-04-051-13/+26
| | | | | | | | | | | | Also, make sure to call the +complete+ hooks if +run+ fails.
* | | 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-303-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
|/ / /
* | | 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
| | |
* | | 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-211-1/+1
|\ \ \ | | | | | | | | changed default value of `caching` option to `nil`
| * | | changed default value of `caching` option to `nil`yuuji.yaginuma2016-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Don't upgrade config.file_watcher during upgrade pathGarrett Bjerkhoel2016-03-181-0/+5
|/ / /
* | | 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.