aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix failing railties testsPrathamesh Sonpatki2016-06-181-2/+2
| | | | | | | | | | | | | | | | | | | | - Railties tests related to fetching asset URL started failing after the release of sprockets 3.6.1 on Travis. - This was due to the change in https://github.com/rails/sprockets/pull/311/files which changed the logic in `concat_javascript_sources` to add `;` at the end of file if the source did not end with semicolon. - Bumped up sprockets minor version and fixed the failing tests.
* | 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 #25390 from gsamokovarov/abstact-unit-presence-requireRafael França2016-06-131-0/+1
|\ \ | | | | | | Require "active_support/core_ext/object/blank" for railties abstract unit
| * | Require "active_support/core_ext/object/blank" for railties abstract unitGenadi Samokovarov2016-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In #25380 I moved an `active_support/core_ext/object/blank` in the `activesupport/lib/active_support/testing/assertions.rb`, however it caused a chain reaction, resulting in failing railties tests. Moving the require to `railties/test/isolation/abstract_unit.rb` and `activesupport/test/abstract_unit.rb`.
* | | Merge pull request #25319 from morgoth/generate-application-record-firstRafael França2016-06-134-18/+18
|\ \ \ | |/ / |/| | Generate application_record.rb file before model file
| * | Generate application_record.rb file before model fileWojciech Wnętrzak2016-06-084-18/+18
| | | | | | | | | | | | | | | | | | Previously model file was generated first, which resulted in inheriting from `ActiveRecord::Base`, but since application_record.rb is generated as well, it should already be used.
* | | Merge pull request #25004 from ↵Eileen M. Uchitelle2016-06-125-0/+44
|\ \ \ | | | | | | | | | | | | | | | | 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-155-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
* | | | Prevent `{ internal: true }` from being stored in the routerJon Moss2016-06-071-0/+6
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgotten followup to #23669 :grimacing: If you went to an internal route (e.g. `/rails/info/routes`), you would previously see the following in your logger: ```bash Processing by Rails::InfoController#routes as HTML Parameters: {"internal"=>true} Rendering /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application Rendered collection of /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_route.html.erb [2 times] (10.5ms) Rendered /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb (2.5ms) Rendered /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application (23.5ms) Completed 200 OK in 50ms (Views: 35.1ms | ActiveRecord: 0.0ms) ``` Now, with this change, you would see: ```bash Processing by Rails::InfoController#routes as HTML Rendering /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application Rendered collection of /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_route.html.erb [2 times] (1.6ms) Rendered /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb (10.2ms) Rendered /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application (17.4ms) Completed 200 OK in 44ms (Views: 28.0ms | ActiveRecord: 0.0ms) ```
* | | Merge pull request #25317 from prathamesh-sonpatki/fix-api-controller-testsKasper Timm Hansen2016-06-072-7/+7
|\ \ \ | | | | | | | | Fix API controller tests by assigning them the encoding type
| * | | Fix API controller tests by assigning them the encoding typePrathamesh Sonpatki2016-06-072-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | Merge pull request #25247 from y-yagi/reference_actual_classKasper Timm Hansen2016-06-071-1/+1
|\ \ \ \ | | | | | | | | | | reference actual class to use middleware
| * | | | reference actual class to use middlewareyuuji.yaginuma2016-06-021-1/+1
| | |_|/ | |/| | | | | | | | | | Using strings for middleware class names is deprecated in 83b767cef90abfc4c2ee9f4b451b0215501fae9a.
* | | | 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-072-2/+4
| | | | | | | | | | | | - 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-044-25/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0110-155/+59
|\ \ | | | | | | Collapse all new default initializers into a single file
| * | Collapse all new default initializers into a single filePrathamesh Sonpatki2016-05-3110-155/+59
| | | | | | | | | | | | | | | | | | - 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-2811-35/+37
| | | | | | | | | | | | - These initializers are new defaults for Rails 5 and newly generated apps do not need to change them. - Fixes #25181
* | Fix more assertion counts.Kasper Timm Hansen2016-05-281-2/+2
| | | | | | | | Follow up to e45f388.
* | Fix assertion count after 69e1bb52.Kasper Timm Hansen2016-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing the generated integration tests to assert redirects with an absolute path this redirection check in `assert_redirected_to` against the absolute response location would now pass: https://github.com/rails/rails/blob/af245aaf3a1c447752a1b5895adddc66e5f73c00/actionpack/lib/action_dispatch/testing/assertions/response.rb#L55 Thus we'd break early instead of hitting `assert_operator` and have 2 fewer assertions per `assert_redirected_to` as `assert_operator` is composed of 2 assertions internally: https://github.com/seattlerb/minitest/blob/4e146b1515b19a5c474e39c174b037510f6dbc6e/lib/minitest/assertions.rb#L254-L258 Deduct 2 assertions for 2 redirects taking the expected count down by 4 in total for the two failing tests.
* | Merge pull request #25182 from rails/remove-public-files-for-api-appsDavid Heinemeier Hansson2016-05-282-1/+18
|\ \ | | | | | | Remove public/ files for API apps
| * | Remove public/ files for API appsPrathamesh Sonpatki2016-05-282-1/+18
| | | | | | | | | | | | - 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 #25119 from javan/actioncable/blade-buildRafael França2016-05-241-1/+0
|\ \ | | | | | | Build action_cable.js with Blade
| * | Remove package:clean taskJavan Makhmali2016-05-241-1/+0
| | | | | | | | | | | | Introduced in d6f2000a67cc63aa67414c75ce77de671824ec52 and was only used by Action Cable. Now handled by Action Cable’s assets:compile task.
* | | Fixing commands with Markdown formattingAnubhav Saxena2016-05-241-3/+3
| | | | | | | | | Adding '$' to emulate shell syntax
* | | Remove version header from railties CHANGELOG.md (#25122)Jon Moss2016-05-241-2/+0
| | | | | | | | | [ci skip]
* | | 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
| | |
* | | Add backticks to `config/secrets.yml`Jon Moss2016-05-211-1/+1
| | | | | | | | | | | | [ci skip]
* | | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:37:20 +0000