aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Drop mysql2 version less than 0.4.3 to guarantee fork safety (#31244)Ryuta Kamizono2017-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #31173, mysql2 adapter depends on `automatic_close` which is introduced since mysql2 0.4.3. So the adapter with the mysql2 version before doesn't work with fork now. ``` % ARCONN=mysql2 be ruby -w -Itest test/cases/connection_adapters/connection_handler_test.rb -n test_forked_child_doesnt_mangle_parent_connection Using mysql2 Run options: -n test_forked_child_doesnt_mangle_parent_connection --seed 19988 /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:108:in `discard!': undefined method `automatic_close=' for #<Mysql2::Client:0x00007fedaa91dfd0> (NoMethodError) ``` This drops mysql2 version less than 0.4.3 to guarantee fork safety.
* | | | | | Merge pull request #31243 from ignat-z/patch-1Rafael França2017-11-271-8/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Fix documentation for deprecation method_wrappers
| * | | | | | [ci skip] Fix documentation for deprecation method_wrappersIgnat Zakrevsky2017-11-271-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like version with class methods doesn't work. ```ruby require "active_support/deprecation.rb" module Fred extend self def aaa; end def bbb; end def ccc; end def ddd; end def eee; end end ActiveSupport::Deprecation.deprecate_methods(Fred, :aaa, bbb: :zzz, ccc: 'use Bar#ccc instead') Fred.aaa Fred.bbb Fred.ccc ``` # produces nothing vs ```ruby require "active_support/deprecation.rb" class Fred def aaa; end def bbb; end def ccc; end def ddd; end def eee; end end ActiveSupport::Deprecation.deprecate_methods(Fred, :aaa, bbb: :zzz, ccc: 'use Bar#ccc instead') Fred.new.aaa Fred.new.bbb Fred.new.ccc ``` produces ``` DEPRECATION WARNING: aaa is deprecated and will be removed from Rails 5.2 (called from <main> at deprications.rb:15) DEPRECATION WARNING: bbb is deprecated and will be removed from Rails 5.2 (use zzz instead) (called from <main> at deprications.rb:16) DEPRECATION WARNING: ccc is deprecated and will be removed from Rails 5.2 (use Bar#ccc instead) (called from <main> at deprications.rb:17) ```
* | | | | | | Add releases notes to the guides indexRafael Mendonça França2017-11-271-0/+4
| | | | | | |
* | | | | | | Preparing for 5.2.0.beta1 releaseRafael Mendonça França2017-11-2727-59/+83
| | | | | | |
* | | | | | | Merge pull request #31242 from fgo/patch-22Rafael França2017-11-271-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Update Rails on Rack guide [ci skip]
| * | | | | | Update Rails on Rack guide [ci skip]Francis Go2017-11-271-2/+2
| | | | | | |
* | | | | | | Update yarn lockRafael Mendonça França2017-11-271-10/+0
| | | | | | |
* | | | | | | Merge pull request #31237 from prathamesh-sonpatki/5-2-release-notesRafael França2017-11-271-0/+210
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added first draft of Rails 5.2 release notes [ci skip]
| * | | | | | | Added CSP as major feature [ci skip]Prathamesh Sonpatki2017-11-271-0/+5
| | | | | | | |
| * | | | | | | Added first draft of Rails 5.2 release notes [ci skip]Prathamesh Sonpatki2017-11-271-0/+205
| | | | | | | |
* | | | | | | | Make form_with_generates_ids default value to be falseRafael Mendonça França2017-11-273-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will keep the behavior of an application with the defaults of a 4.2 or 5.0 application behaving the same when upgrading to 5.2.
* | | | | | | | Remove Content-Security-Policy initializer in API-only Applicationsyuuji.yaginuma2017-11-272-0/+8
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `ContentSecurityPolicy::Middleware` is not loaded in API-only Applications, initializer is unnecessary. Ref: https://github.com/rails/rails/blob/9c10fec4c06da38f8975dfb851f4d899aa85f8b7/railties/lib/rails/application/default_middleware_stack.rb#L66..L68
* | | | | | | Update the middleware list with CSP [ci skip]Prathamesh Sonpatki2017-11-271-0/+1
| | | | | | |
* | | | | | | Merge pull request #31238 from prathamesh-sonpatki/csp-initializer-testAndrew White2017-11-271-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added missing test for presence of CSP initializer
| * | | | | | | Added missing test for presence of CSP initializerPrathamesh Sonpatki2017-11-271-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | - Followup of #31162
* | | | | | | Merge pull request #31239 from prathamesh-sonpatki/fix-changelog-for-cspAndrew White2017-11-271-10/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix CHANGELOG for CSP PR #31162 [ci skip]
| * | | | | | Fix CHANGELOG for CSP PR #31162 [ci skip]Prathamesh Sonpatki2017-11-271-10/+10
|/ / / / / /
* | | | | | Add CHANGELOG.md entry for #31162 [ci skip]Andrew White2017-11-271-0/+60
| | | | | |
* | | | | | Merge pull request #31162 from rails/add-csp-configAndrew White2017-11-2713-34/+886
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add DSL for configuring Content-Security-Policy header
| * | | | | | Add DSL for configuring Content-Security-Policy headerAndrew White2017-11-2713-34/+886
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
* | | | | | | Enable `Style/DefWithParentheses` rubocop ruleRyuta Kamizono2017-11-275-4/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The def with blank `()` was newly added in #31176, but we have not used the blank `()` style in most part of our code base. So I've enabled `Style/DefWithParentheses` to prevent to newly added the code.
* | | | | | Merge pull request #31236 from y-yagi/use_puma_311_in_new_appsGuillermo Iguaran2017-11-272-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use Puma 3.11 in newly generated applications
| * | | | | | Use Puma 3.11 in newly generated applicationsyuuji.yaginuma2017-11-272-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to use early hints, need to use Puma 3.11.0 or higher. So, I think that should specify that version in newly generated applications. Ref: https://github.com/puma/puma/commit/f6f3892f4d82638fb7a2a57d993641b1486ee88a
* | | | | | Merge pull request #31167 from albertoalmagro/clean-db-ambiguityRafael França2017-11-261-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clean database naming ambiguity
| * | | | | | Remove DB naming ambiguityAlberto Almagro2017-11-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In some places this file referred to the database in three different ways: database, DB and db. The last one caused confusion with the db namespace and the db folder. This commit removes this ambiguity by using the whole word 'database' everywhere
* | | | | | | Add new error class `QueryCanceled` which will be raised when canceling ↵Ryuta Kamizono2017-11-276-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement due to user request (#31235) This changes `StatementTimeout` to `QueryCanceled` for PostgreSQL. In MySQL, errno 1317 (`ER_QUERY_INTERRUPTED`) is only used when the query is manually cancelled. But in PostgreSQL, `QUERY_CANCELED` error code (57014) which is used `StatementTimeout` is also used when the both case. And, we can not tell which reason happened. So I decided to introduce new error class `QueryCanceled` closer to the error code name.
* | | | | | | Rename `TransactionTimeout` to more descriptive `LockWaitTimeout` (#31223)Ryuta Kamizono2017-11-276-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #31129, new error class `StatementTimeout` has been added. `TransactionTimeout` is caused by the timeout shorter than `StatementTimeout`, but its name is too generic. I think that it should be a name that understands the difference with `StatementTimeout`.
* | | | | | | Merge pull request #31229 from y-yagi/remove_field_ids_from_scaffold_formKasper Timm Hansen2017-11-263-11/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove field ids from scaffold form
| * | | | | | | Remove field ids from scaffold formyuuji.yaginuma2017-11-263-11/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added with 27f103fc7e3260efe0b8dde66bf5354f2202ee32 for link labels and fields. However, `form_with` changed to generates ids by default with d3893ec38ec61282c2598b01a298124356d6b35a. So I think that adding an explicit ids is unnecessary.
* | | | | | | Revert "Merge pull request #31006 from ↵eileencodes2017-11-262-17/+0
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails/kamipo/ordinal_methods_should_respect_loaded_records" This reverts commit 0f79ab91150b4cdb6c018530978a3395962c7a02, reversing changes made to d575f7f2e737739302a0e8210d01c10f5d4e2c35. This PR philosophically conflicts with #30800 and Matthew thinks we should hold off merging this until we find concensus. Reverting since we're about to cut a release for 5.2.
* | | | | | Revert "Remove stopgap_13632 entirely for now: it doesn't support 2.2.8"Matthew Draper2017-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 536d3068b964d5848ebc47292c21c0fb0450c17b.
* | | | | | Merge pull request #31221 from matthewd/flush-idle-connectionsMatthew Draper2017-11-266-17/+129
|\ \ \ \ \ \ | | | | | | | | | | | | | | Flush idle database connections
| * | | | | | Flush idle database connectionsMatthew Draper2017-11-266-17/+129
| | | | | | |
* | | | | | | Merge pull request #31232 from ↵Matthew Draper2017-11-261-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | weedySeaDragon/engines-guide-copyediting--neutral-copyediting-171126 minor Engines guide copyedits: neutral language, verb tense, comma splice [ci skip]
| * | | | | | | fix comma splice [ci skip]Ashley Engelund (weedySeaDragon @ github)2017-11-261-1/+1
| | | | | | | |
| * | | | | | | verb tense correction [ci skip]Ashley Engelund (weedySeaDragon @ github)2017-11-261-1/+1
| | | | | | | |
| * | | | | | | gendered wording not necessary; changed to neutral [ci skip]Ashley Engelund (weedySeaDragon @ github)2017-11-261-1/+1
|/ / / / / / /
* | / / / / / Let rubygems handle our objection to mysql2 0.4.3Matthew Draper2017-11-261-2/+1
| |/ / / / / |/| | | | |
* | | | | | Remove duplicated `form_with_generates_remote_forms` settingyuuji.yaginuma2017-11-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When load `5.1` config, `form_with_generates_remote_forms` is set. https://github.com/rails/rails/blob/89a209f1abba5a2320d31c4898dea150c0abd0c0/railties/lib/rails/application/configuration.rb#L86
* | | | | | Merge pull request #31184 from TheSmartnik/fix_record_not_found_on_reloadRafael França2017-11-254-7/+35
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Provide arguments to RecordNotFound
| * | | | | Provide arguments to RecordNotFoundNikita Misharin2017-11-254-7/+35
| | | | | |
* | | | | | Merge pull request #31181 from tenshilg/fix-api-guidesRafael França2017-11-251-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix names of http authentication modules in api only guides
| * | | | | | Fix names of http authentication modules in api_app guidesRoman Kovtunenko2017-11-191-2/+4
| | | | | | |
* | | | | | | Renove duplicated and wrong testRafael Mendonça França2017-11-251-5/+0
| | | | | | |
* | | | | | | Add test to make sure form_for is not affected byRafael Mendonça França2017-11-251-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | form_with_generates_ids
* | | | | | | Make sure that form_with_generates_ids only affects form_withRafael Mendonça França2017-11-255-3/+9
| | | | | | |
* | | | | | | Use parentheses for multi-line method callsRafael Mendonça França2017-11-252-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Own style guide says we should be using parentheses for method calls with arguments.
* | | | | | | Merge pull request #29439 from npezza93/set-skip-default-idsRafael Mendonça França2017-11-2512-228/+316
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow skip_default_ids option to be set in form_with
| * | | | | | | Make form_with_generates_ids default in Rails 5.2Rafael Mendonça França2017-11-252-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the defaults being loaded are the 5.0 or 5.1 we disable generation of ids with form_with.