aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix conditional order broken in ea40ec56.Kasper Timm Hansen2016-07-021-2/+2
|
* Merge pull request #25344 from matthewd/debug-locksMatthew Draper2016-07-024-5/+172
|\ | | | | ActionDispatch::DebugLocks
| * Provide a middleware to debug misbehaving locksMatthew Draper2016-06-104-5/+172
| | | | | | | | | | Only intended to be enabled when in use; by necessity, it sits above any reasonable access control.
* | Merge pull request #24146 from matthewd/latch-as-proxyMatthew Draper2016-07-021-5/+12
|\ \ | | | | | | Don't inherit from Concurrent::CountDownLatch
| * | Don't inherit from Concurrent::CountDownLatchMatthew Draper2016-03-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That class mangles .new, which interferes with our deprecation warning. More generally, it suggests we shouldn't be subclassing without a very good reason, and avoiding one allocation doesn't seem to meet that criteria. In passing, recommend the simpler Concurrent::Event for the common count=1 case.
* | | Merge pull request #25615 from tinco/close_hijacked_socketMatthew Draper2016-07-022-0/+15
|\ \ \ | | | | | | | | close hijacked i/o socket after use (fixes #25613)
| * | | close hijacked i/o socket after use (fixes #25613)Tinco Andringa2016-07-012-0/+15
| | | |
* | | | Ensure logging on exceptions only includes what we expectMatthew Draper2016-07-021-0/+23
| | | |
* | | | Silence DebugExceptions template render logs during exceptionsGenadi Samokovarov2016-07-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an exception is raised, those Action View rendering logs are just noise for the end developer. I recently silenced those from Web Console, as we do use Action View rendering in it as well. It used created a half a screen of rendering logs. I think we can save those in this recent push for cleaner development logs. Now, the silencing is a bit hacky and we have a bunch of it now, so we can also invest in turning off the logs directly from Action View objects instead of silencing off the logging stream.
* | | | Make mutation stand out some more.Kasper Timm Hansen2016-07-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Felt that += overwriting the path variable was a little too hidden. Make the outcomes easier to spot with an if-else branch.
* | | | Merge pull request #25632 from volmer/fix-integration-test-frozen-literalsKasper Timm Hansen2016-07-011-1/+1
|\ \ \ \ | | | | | | | | | | Fix request encoding in tests when string literals are frozen
| * | | | Fix request encoding in tests when string literals are frozenVolmer2016-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running tests with `--enable-frozen-string-literal` or `# frozen_string_literal: true`, it's currently attempted to mutate the path string in order to append the format, causing a `RuntimeError`. ```ruby get '/posts', as: :json ``` ``` RuntimeError: can't modify frozen String ``` This commit fixes the problem by replacing the mutation with a concatenation, returning a new string.
* | | | | Merge pull request #25600 from pan/constantize-docfixVipul A M2016-07-011-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | fix ActiveSupport::Infector.constantize usage API doc [ci skip]
| * | | | fix ActiveSupport::Infector.constantize usage API doc [ci skip]Pan GaoYong2016-06-301-4/+4
| | | | |
* | | | | Add regression test for foreign key schema dump cachingeileencodes2016-07-011-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you had a foreign key set and then decided to add `on_delete: :cascade` later in another migration that migration would run but wouldn't refresh the schema dump. The reason for this was because `create_table_info` caches the statement and sets it to be the same as the original declaration for the foreign key (without the `on_delete: :cascade`. PR #25307 ended up fixing this bug because it removes the check for `create_table_info` and relies on reading from `information_schema`. The fix however was intended to patch another bug. The reason this fixes the issue is we're no longer parsing the regex from the cached `create_table_info`. This regression test is to ensure that the issue does not return if we for some reason go back to using `create_table_info` to set the foreign keys.
* | | | | Merge pull request #25307 from ↵Eileen M. Uchitelle2016-07-015-36/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/extract_foreign_key_action_from_information_schema Extract foreign key action from `information_schema`
| * | | | | Extract foreign key action from `information_schema`Ryuta Kamizono2016-06-074-34/+44
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #25300.
| * | | | | Make `foreign_keys` queries to `SCHEMA`Ryuta Kamizono2016-06-072-2/+2
| | | | | |
* | | | | | Fix release task now that NPM is part of the buildeileencodes2016-07-011-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this commit looks super weird becuase git. I'm moving the entire NPM section to the part where we actually push the gems/npm package for the reasons below. That's not how the git diff looks though. When we release Rails we run `rake prep_release` which calls `update_versions`. This was updating the NPM version as well. But when we would later run `rake install` to test the installed gem `update_versions` gets called again which causes the install to fail because NPM sees the version is the same as the last run and refuses to continue. If you forget to stash this will then cause the push to RubyGems to fail because `update_versions` is called again and then NPM will not continue because it thinks the version hasn't been changed even though it has. The correct solution would be to not update the NPM verion if it matches the version already in the file but after an hour I could not find a simple way to use NPM to read the current version. Honestly that's not the best way to do it either because say you forget to update something else and then the script thinks it's already been updated. With that in mind I think the best solution is to not update the NPM version until right before we are going to push to NPM because then that won't cause the push to RubyGems to fail.
* | | | | | Merge pull request #25618 from kamipo/fix_release_notesRafael França2016-07-011-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Deprecation passing of `start` value was removed [ci skip]
| * | | | | | Deprecation passing of `start` value was removed [ci skip]Ryuta Kamizono2016-07-011-4/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | ref #18961, #23099.
* | | | | | Merge pull request #25582 from alexcameron89/action_controller_baseप्रथमेश Sonpatki2016-07-011-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Add 'params' formatting in ActionController::Base
| * | | | | | [ci skip] Add 'params' formatting in ActionController::BaseAlex Kitchens2016-06-301-4/+4
| | | | | | |
* | | | | | | Merge pull request #25553 from vipulnsward/25543-docs-follow-upVipul A M2016-06-301-16/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 25543 docs cleanup
| * | | | | | | - Tone down documentationVipul A M2016-06-281-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove repetative docs - Fix grammar on sentences - Add escaping for literals [ci skip]
* | | | | | | | Merge pull request #25431 from ↵Rafael França2016-06-302-1/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/add-note-about-upgrade-guide-at-the-end-of-update Display link to Rails upgrade guide at the end of `rails app:update` task.
| * | | | | | | | Display link to Rails upgrade guide at the end of `rails app:update` task.Prathamesh Sonpatki2016-06-302-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This will nudge people in the direction of going through upgrade guides.
* | | | | | | | | Use sass-rails in our test suiteRafael Mendonça França2016-06-303-1/+10
| | | | | | | | |
* | | | | | | | | Merge pull request #25612 from vipulnsward/publish-testing-guideRafael França2016-06-301-2/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Mark Testing Guide as pubished and reword the title
| * | | | | | | | | Mark Testing Guide as pubished and reword the title[ci skip]Vipul A M2016-06-301-2/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #25611 from alexcameron89/upgrading_rails_guideVipul A M2016-06-301-16/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Fix Typos and Punctuation in Guides: Upgrading
| * | | | | | | | | [ci skip] Fix Typos and Punctuation in Guides - UpgradingAlex Kitchens2016-06-301-16/+16
|/ / / / / / / / /
* | | | | | | | | Do not allow rack pre releasesRafael Mendonça França2016-06-302-6/+5
| | | | | | | | |
* | | | | | | | | Merge pull request #25609 from rosenfeld/patch-8Eileen M. Uchitelle2016-06-301-0/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a Rails 5 release note for ActionController::Live becoming a Concern
| * | | | | | | | | Add a Rails 5 release note for ActionController::Live becoming a ConcernRodrigo Rosenfeld Rosas2016-06-301-0/+11
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to issue #25581 https://github.com/rails/rails/issues/25581
* | | | | | | | | Merge pull request #25608 from rosenfeld/patch-7Eileen M. Uchitelle2016-06-301-0/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add an upgrade note related to ActionController::Live becoming a Concern
| * | | | | | | | | Add an upgrade note related to ActionController::Live becoming a ConcernRodrigo Rosenfeld Rosas2016-06-301-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See issue #25581: https://github.com/rails/rails/issues/25581
* | | | | | | | | | Merge pull request #25607 from sstephenson/turbolinks-5-finalRafael Mendonça França2016-06-303-11/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Update to Turbolinks 5.0.0 final
| * | | | | | | | | Update to Turbolinks 5.0.0 finalSam Stephenson2016-06-303-11/+6
| | | | | | | | | |
* | | | | | | | | | Point to released coffee-railsRafael Mendonça França2016-06-303-11/+6
|/ / / / / / / / /
* | | | | | | | | Fix styles of headings to follow guide ruleseileencodes2016-06-301-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the style guide: When writing headings, capitalize all words except for prepositions, conjunctions, internal articles, and forms of the verb "to be":
* | | | | | | | | Merge pull request #25604 from alexcameron89/upgrading_rails_guideRafael França2016-06-301-12/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Change wording & punctuation in Guides - Upgrading
| * | | | | | | | | Change wording & punctuation in Guides - UpgradingAlex Kitchens2016-06-301-12/+11
| | | | | | | | | |
* | | | | | | | | | Merge pull request #25602 from matthewd/restore-key-generatorMatthew Draper2016-07-012-7/+22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Partially revert #25192
| * | | | | | | | | Partially revert #25192Matthew Draper2016-07-012-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyGenerator is used in other contexts, and we cannot change its output... even if it does accidentally default to generating excess key material for our primary internal usage.
* | | | | | | | | | fixes config value [ci skip]Xavier Noria2016-06-301-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | expands a bit a section of the upgrade guide [ci skip]Xavier Noria2016-06-301-4/+15
|/ / / / / / / /
* | | | | | | | Merge pull request #25587 from vipulnsward/publish-release-notesEileen M. Uchitelle2016-06-301-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Publish Rails 5 release notes
| * | | | | | | | Publish Rails 5 release notes[ci skip]Vipul A M2016-06-291-1/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #25596 from prathamesh-sonpatki/testing-guide-50Eileen M. Uchitelle2016-06-301-42/+102
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update testing guide for Rails 5
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 02:52:16 +0000