aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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-214-3/+46
| | | | | | | | environments
* | Merge pull request #24918 from prathamesh-sonpatki/cable-assetsRafael França2016-05-212-4/+24
|\ \ | | | | | | Cable: Generate .js or .coffee files while generating channel as per the javascript engine of the application
| * | Cable: Generate .js or .coffee files while generating channel as per the ↵Prathamesh Sonpatki2016-05-172-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
* | | `md5` --> `MD5`Jon Moss2016-05-171-1/+1
|/ / | | | | | | | | Sorry, I missed a few places in my last PR. This should be the last of 'em :grimacing:
* | 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-102-530/+3
| |
* | Preparing for 5.0.0.rc1 releaseRafael Mendonça França2016-05-062-1/+6
| |
* | Fix etag expectation to work with the SHA256Rafael Mendonça França2016-05-061-1/+1
| | | | | | | | It is related with https://github.com/rack/rack/commit/7b66d2cdb80a4d6b44fa8c61d92e25fbbda1f152
* | Fix some typos in comments.Joe Rafaniello2016-05-042-2/+2
| | | | | | | | [ci skip]
* | Prep Rails 5 beta 4eileencodes2016-04-272-1/+3
| |
* | Merge pull request #24696 from y-yagi/remove_unnessary_option_settingKasper Timm Hansen2016-04-254-5/+24
|\ \ | | | | | | remove unnessary option setting from test runner
| * | register rake options to `OptionParser`yuuji.yaginuma2016-04-252-0/+14
| | | | | | | | | | | | | | | In order to prevent `OptionParser::ParseError` when specify the rake options to `routes` task.
| * | remove unnessary option setting from test runneryuuji.yaginuma2016-04-252-5/+10
| | | | | | | | | | | | | | | | | | | | | 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!
* | | Fix broken build, channel files are also included in `bin/rails stats` nowPrathamesh Sonpatki2016-04-241-2/+2
| | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/24709.
* | | add channels files in `stats` taskyuuji.yaginuma2016-04-241-0/+1
| | |
* | | Add compatibility for Ruby 2.4 `to_time` changesAndrew White2016-04-234-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Fix test nameVipul A M2016-04-231-1/+1
|/ /
* | Merge pull request #24680 from mohitnatoo/rake-dev-cacheKasper Timm Hansen2016-04-211-1/+1
|\ \ | | | | | | using rails dev:cache instead of rake dev:cache
| * | - using rails dev:cache instead of rake dev:cacheMohit Natoo2016-04-221-1/+1
| | |
* | | 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
|/ /
* | Fixed assertions with regex used in dbs testsVipul A M2016-04-191-2/+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 #24551 from bogdanvlviv/notice_for_tasksJeremy Daer2016-04-172-2/+4
|\ \ | | | | | | Added notice when a database is successfully created or dropped.
| * | Added notice when a database is successfully created or dropped.bogdanvlviv2016-04-172-2/+4
| | |
* | | don't remove `cable.js`yuuji.yaginuma2016-04-161-0/+12
|/ / | | | | | | `cable.js` is required for other Channels.
* | Generate `cable.js` file if does not exist when generating channelPrathamesh Sonpatki2016-04-121-0/+8
| | | | | | | | | | | | | | | | | | - Before this, while generating a channel, we were not creating `cable.js` if it does not already exist. - We have similar code for application mailer here - https://github.com/rails/rails/commit/0b3ae023d27197417541932632055cd6be4810c4. - Based on the comment - https://github.com/rails/rails/issues/24418#issuecomment-205421995.
* | Merge pull request #24495 from vipulnsward/rails-changelog-passSantiago Pastorino2016-04-111-18/+18
|\ \ | | | | | | Railties CHANGELOG Pass [ci skip]
| * | - Fence some commands, options, gems, etc. with quotesVipul A M2016-04-101-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing config to complete config names - Fixed route generators changelog grammar. - rake:stats => rake stats - Fixed grammar of assert_file change - Make sure we end all sentences [ci skip]
* | | 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-102-5/+2
|/ / | | | | | | | | | | 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
* | Merge pull request #24165 from y-yagi/generate_application_job_when_not_existEileen M. Uchitelle2016-04-092-0/+20
|\ \ | | | | | | generate ApplicationJob if it does not already exist
| * | generate ApplicationJob if it does not already existyuuji.yaginuma2016-03-252-0/+20
| | | | | | | | | | | | | | | | | | ActiveJob jobs now inherit from ApplicationJob by default. However, when updating to Rails 5 from the old Rails, since there is a possibility that ApplicationJob does not exist.
* | | Use new hash syntax (#24464)Jeroen Visser2016-04-082-4/+4
| | | | | | | | | | | | | | | | | | * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 19:47:59 +0000