aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* No need to have conditional based on api options in assetsPrathamesh Sonpatki2016-06-201-2/+0
| | | | | | - As assets are removed for API only apps anyways, so we don't need any conditional upfront. - assets are removed for API apps here - https://github.com/rails/rails/blob/94ef224aa61ace3fa643eab161ff9056b7d90a62/railties/lib/rails/generators/rails/app/app_generator.rb#L266-L273.
* Move quiet option to development.rbRafael Mendonça França2016-06-162-3/+3
| | | | | This option is used in a initializer hook that runs before the config/initializers files so it will not work if it is set there.
* Merge pull request #25004 from ↵Eileen M. Uchitelle2016-06-123-0/+21
|\ | | | | | | | | y-yagi/generate_mailer_layout_files_if_it_does_not_already_exist generate mailer layout files if it does not already exist
| * generate mailer layout files if it does not already existyuuji.yaginuma2016-05-153-0/+21
| | | | | | | | | | | | | | | | | | Currently, if `ApplicationMailer` does not exist, it is generated when run the mailer generator, but layouts files does not generate. However, because it uses the layouts in `ApplicationMailer`, layouts are required. Follow up to #24161
* | Add config.assets.quiet = true as default valueKevin McPhillips2016-06-101-0/+3
| |
* | Merge pull request #25317 from prathamesh-sonpatki/fix-api-controller-testsKasper Timm Hansen2016-06-071-5/+5
|\ \ | | | | | | Fix API controller tests by assigning them the encoding type
| * | Fix API controller tests by assigning them the encoding typePrathamesh Sonpatki2016-06-071-5/+5
| | | | | | | | | | | | | | | | | | | | | - Fixes #25183. - The `as: :json` feature was added in https://github.com/rails/rails/pull/21671 and recommended to use for JSON endpoints so let's use it by default for API controller tests.
* | | Flag `to_time` + simplify version names.Kasper Timm Hansen2016-06-071-5/+6
|/ / | | | | | | | | | | | | | | | | Since Ruby 2.4 isn't out yet, the fact that it will make `to_time` preserve the time zone should be toggled with a update flag. Second, remove the flipping on what version had what defaults. It's called new framework defaults, so it's from the future looking. Thus keep the line that mentions past versions.
* | Use the `update` flag to provide more friendlier messages to people upgrading.Prathamesh Sonpatki2016-06-071-12/+9
| |
* | Remove FORCE option as it was only needed for testsPrathamesh Sonpatki2016-06-071-1/+1
| | | | | | | | - Adjusted tests instead.
* | Update the documentation of new_framework_defaults file with more details ↵Prathamesh Sonpatki2016-06-041-13/+16
| | | | | | | | | | | | about old apps and how you can upgrade to new defaults. [Kasper Timm Hansen, Prathamesh Sonpatki]
* | Fix minor regression about old apps not getting per_form_csrf and ↵Prathamesh Sonpatki2016-06-043-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | request_forgery_protection configs - Earlier per_form_csrf_tokens and request_forgery_protection config files were generated for old apps upgraded to Rails 5. - But when we collapsed all initializers into one file, the entire file does not get created for old apps. - This commit fixes it and also changes values for all new defaults for old apps so that they will not break. - Also added a test for `rails app:update`.
* | More cleanup of new framework defaultsPrathamesh Sonpatki2016-06-041-18/+12
| | | | | | | | | | | | | | - Move real new default options to the top of the file. - After that club together all the options which were added to keep backward compatibility. So all of them will get only one header. - Based on https://github.com/rails/rails/pull/25231#issuecomment-222945173.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-031-1/+1
|\ \ | | | | | | | | | | | | Conflicts: guides/source/action_cable_overview.md
| * | `behaviour` --> `behavior`Jon Moss2016-05-271-1/+1
| |/ | | | | | | http://edgeguides.rubyonrails.org/api_documentation_guidelines.html#english
* | Properly support reloading for Action Cable channelsMatthew Draper2016-06-022-2/+0
| |
* | Merge pull request #25231 from prathamesh-sonpatki/collapse-new-initializersDavid Heinemeier Hansson2016-06-018-62/+40
|\ \ | | | | | | Collapse all new default initializers into a single file
| * | Collapse all new default initializers into a single filePrathamesh Sonpatki2016-05-318-62/+40
| | | | | | | | | | | | | | | | | | - Adjusted tests also for this new behavior. - Based on the discussion in https://github.com/rails/rails/pull/25184#issuecomment-222454583.
* | | Bump jbuilder dependency to version 2.5.0 for compatibility fixesDavid Heinemeier Hansson2016-05-311-1/+1
|/ /
* | Move new default initializers into separate directoryPrathamesh Sonpatki2016-05-288-15/+17
| | | | | | | | | | | | - These initializers are new defaults for Rails 5 and newly generated apps do not need to change them. - Fixes #25181
* | Merge pull request #25182 from rails/remove-public-files-for-api-appsDavid Heinemeier Hansson2016-05-281-0/+11
|\ \ | | | | | | Remove public/ files for API apps
| * | Remove public/ files for API appsPrathamesh Sonpatki2016-05-281-0/+11
| | | | | | | | | | | | - Fixes #25180
* | | Redirects are to urls, not pathsDavid Heinemeier Hansson2016-05-281-3/+3
| | |
* | | The first comment does not explain anything that the code doesnt and the ↵David Heinemeier Hansson2016-05-281-2/+0
| | | | | | | | | | | | second is now irrelevant with the dedicated API mode
* | | Boil down custom Action Cable configuration to a single blockDavid Heinemeier Hansson2016-05-281-4/+2
|/ /
* | Merge pull request #25061 from eugeneius/rails_max_threads_mysql_sqliteRichard Schneeman2016-05-2410-2/+10
|\ \ | | | | | | Use RAILS_MAX_THREADS as pool size on all adapters
| * | Use RAILS_MAX_THREADS as pool size on all adaptersEugene Kenny2016-05-2410-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | When RAILS_MAX_THREADS is set, the postgresql adapter uses it as the connection pool size, so that there are always enough connections available to serve Action Cable requests. The same logic applies when using any other adapter.
* | | 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.