aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #33452 from thetizzo/rails_32_to_40_doc_updateGeorge Claghorn2018-08-031-0/+11
|\ | | | | [Documentation] Mention default HTTP headers in Rails 3.2 to 4.0 upgrade guide
| * Update Rails 3.2 to 4.0 upgrade guide to include a mention and tip for ↵thetizzo2018-08-031-0/+11
| | | | | | | | handling the addition of configurable default HTTP headers. [ci skip]
* | Merge pull request #33524 from spikeheap/masterPrem Sichanugrist2018-08-031-1/+1
|\ \ | | | | | | [Documentation] Fix "adding member routes" guide inconsistency
| * | [ci skip] Update adding member routes guide to fix inconsistency with the ↵Ryan Brooks2018-08-031-1/+1
|/ / | | | | | | implementation. Closes #33518
* | `retrieve_connection_pool` return a pool, not a connectionRyuta Kamizono2018-08-031-2/+2
| |
* | Remove another unused requireGeorge Claghorn2018-08-021-2/+0
| |
* | Merge pull request #33513 from twitnithegirl/only_connect_once_in_parallel_testsRyuta Kamizono2018-08-021-1/+0
|\ \ | | | | | | remove redundant establish_connection call in test_databases.rb
| * | don't establish connection test_database since it gets established in ↵Britni Alexander2018-08-011-1/+0
|/ / | | | | | | load_schema
* | Remove unused requireGeorge Claghorn2018-08-011-2/+0
| |
* | Merge pull request #33479 from twitnithegirl/make_parallel_testing_db_fasterEileen M. Uchitelle2018-08-012-6/+9
|\ \ | | | | | | Make parallel testing db faster
| * | use load_schema instead of migrate for parallel testingBritni Alexander2018-07-312-6/+9
|/ /
* | Retry ActiveStorage::PurgeJobs on DB deadlockGeorge Claghorn2018-07-311-0/+1
| |
* | Merge pull request #33492 from kamipo/revert_breaking_default_order_contractRyuta Kamizono2018-08-013-22/+14
|\ \ | | | | | | Revert the breaking existing default sort order contract
| * | Revert "Merge pull request #24131 from brchristian/limit_and_primary_key"Ryuta Kamizono2018-08-013-22/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d162188dd662a7d9f62ba8431474f50bc35e3e93, reversing changes made to 3576782888c307e3e192c44e332b957cd1174128. Reason: #24131 conflicts the #5153's default order contract, it means that existing apps would be broken by that change. We don't want to break existing apps without a deprecation cycle.
| * | Add test case for the #5153's default order contractRyuta Kamizono2018-08-011-0/+13
| | |
* | | Merge pull request #28937 from maclover7/jm-fix-28927Rafael França2018-07-312-1/+15
|\ \ \ | |/ / |/| | Default content type for `head` is `text/html`
| * | Default content type for `head` is `text/html`Jon Moss2017-04-302-1/+15
| | | | | | | | | | | | Otherwise Mime::NullType will be returned as the `Content-Type` header.
* | | Merge pull request #33490 from ↵Xavier Noria2018-07-311-0/+2
|\ \ \ | | | | | | | | | | | | | | | | rails/revert-31883-remove-label-in-porgress-for-M-V-guides Revert "Remove label 'work in progress' for AM and AV guides"
| * | | Revert "Remove label 'work in progress' for AM and AV guides"Xavier Noria2018-07-311-0/+2
|/ / /
* | | Merge pull request #31883 from ↵Richard Schneeman2018-07-311-2/+0
|\ \ \ | | | | | | | | | | | | | | | | bogdanvlviv/remove-label-in-porgress-for-M-V-guides Remove label 'work in progress' for AM and AV guides
| * | | Remove label 'work in progress' for AM and AV guidesbogdanvlviv2018-02-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | I've reviewed "Active Model Basics" and "Action View Overview" guides and looks like they have good enough information and don't have errors. This commit removes label 'work in progress' for these guides.
* | | | Merge pull request #33488 from znz/avoid-to-post-twiceRafael França2018-07-311-1/+2
|\ \ \ \ | | | | | | | | | | Throw if ujs loaded twice
| * | | | Throw if ujs loaded twiceKazuhiro NISHIYAMA2018-07-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I saw two posts of problem about ajax requesting twice on qiita. So I think detecting double loaded earlier make easy to find the problem. https://qiita.com/hot_study_man/items/56dc87ad734cfda68bb6 https://qiita.com/hisas/items/8399aec3a5377bf75017
* | | | | Merge pull request #33489 from Atul9/remote-ipGeorge Claghorn2018-07-312-1/+7
|\ \ \ \ \ | |/ / / / |/| | | | Log the remote IP addr of clients behind a proxy
| * | | | Log the remote IP addr of clients behind a proxyAtul Bhosale2018-07-312-1/+7
|/ / / / | | | | | | | | | | | | [Atul Bhosale, Victor Nawothnig]
* | | | :scissors: .Ryuta Kamizono2018-07-311-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #33446 from ptoomey3/nested-respond-toRichard Schneeman2018-07-314-0/+70
|\ \ \ \ | | | | | | | | | | Raises exception when respond_to called multiple times in incompatible way
| * | | | Raises exception when respond_to called multiple times in incompatible wayPatrick Toomey2018-07-304-0/+70
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nesting respond_to calls can lead to unexpected behavior, so it should be avoided. Currently, the first respond_to format match sets the content-type for the resulting response. But, if a nested respond_to occurs, it is possible to match on a different format. For example: respond_to do |outer_type| outer_type.js do respond_to do |inner_type| inner_type.html { render body: "HTML" } end end end Browsers will often include */* in their Accept headers. In the above example, such a request would result in the outer_type.js match setting the content- type of the response to text/javascript, while the inner_type.html match will cause the actual response to return "HTML". This change tries to minimize potential breakage by only raising an exception if the nested respond_to calls are in conflict with each other. So, something like the following example would not raise an exception: respond_to do |outer_type| outer_type.js do respond_to do |inner_type| inner_type.js { render body: "JS" } end end end While the above is nested, it doesn't affect the content-type of the response.
* | | | Merge pull request #33486 from f-mer/patch-1Ryuta Kamizono2018-07-311-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix example in thread_mattr_accessor documentation [ci skip]
| * | | | Fix example in thread_mattr_accessor documentationFabian Mersch2018-07-311-1/+1
|/ / / /
* | | | Merge pull request #33484 from aditya-kapoor/fix-find-each-descriptionKasper Timm Hansen2018-07-311-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Fix the outdated description for `find_each`.
| * | | | [ci skip] Fix the outdated description for `find_each`.Aditya Kapoor2018-07-311-1/+1
| | | | |
* | | | | Merge pull request #33481 from da-edra/readme-over-httpsKasper Timm Hansen2018-07-311-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | [Docs] All links from README.md now served over https
| * | | | All links from README.md now served over httpsAndrea Gómez2018-07-311-5/+5
|/ / / /
* | | | Guard against missing blobs caused by concurrent purgesGeorge Claghorn2018-07-301-3/+3
| | | |
* | | | Remove unused requireRyuta Kamizono2018-07-311-1/+0
| | | | | | | | | | | | | | | | | | | | "active_support/core_ext/module/aliasing" is no longer used since #19434.
* | | | Avoid extra scoping when using `Relation#update`Ryuta Kamizono2018-07-313-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 9ac7dd4, class level `update`, `destroy`, and `delete` were placed in the `Persistence` module as class methods. But `Relation#update` without passing ids which was introduced at #11898 is not a class method, and it was caused the extra scoping regression #33470. I moved the relation method back into the `Relation` to fix the regression. Fixes #33470.
* | | | Merge pull request #33325 from Edouard-chin/ec-deprecate-class-methodRyuta Kamizono2018-07-312-14/+52
|\ \ \ \ | | | | | | | | | | A regression in `deprecate_methods` was introduced in a982a42:
| * | | | A regression in deprecate_methods was introduced in a982a42:Edouard CHIN2018-07-302-14/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactoring alias_chain to Module#prepend broke the possibility to deprecate class methods since the module generated was prepended to the target's instance. A suggestion to fix this was to use `AS#redefine_method` which would solve the problem but with the cost of redefining directly the method. Decided to go with the same alias_chain implementation as before instead. - Fixes #33253
* | | | | Merge pull request #33467 from bdewater/chomp-unconditionallyKasper Timm Hansen2018-07-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Chomp will work without checking for end of the string
| * | | | | Chomp will work without checking for end of the stringBart de Water2018-07-291-2/+2
| | | | | |
* | | | | | Ignore concurrently-deleted files when deleting by prefix from GCSGeorge Claghorn2018-07-301-1/+7
| | | | | |
* | | | | | Merge pull request #33471 from yahonda/follows_up_33449Ryuta Kamizono2018-07-311-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | cpu_time and allocations are 0 when JRuby is used
| * | | | | | cpu_time and allocations are 0 when JRuby is usedYasuo Honda2018-07-301-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to #33449 and #33468, cpu_time and allocations are 0 when JRuby is used. ```ruby $ ruby -v jruby 9.2.1.0-SNAPSHOT (2.5.0) 2018-07-27 13b2df5 Java HotSpot(TM) 64-Bit Server VM 25.181-b13 on 1.8.0_181-b13 [linux-x86_64] $ bundle exec ruby -w -Itest test/log_subscriber_test.rb -n test_event_attributes Run options: -n test_event_attributes --seed 6231 F Failure: SyncLogSubscriberTest#test_event_attributes [test/log_subscriber_test.rb:84]: Expected 0 to be > 0. rails test test/log_subscriber_test.rb:78 Finished in 0.018983s, 52.6791 runs/s, 105.3582 assertions/s. 1 runs, 2 assertions, 1 failures, 0 errors, 0 skips ```
* | | | | | | MySQL: Raise ActiveRecord::InvalidForeignKey for foreign-key constraint ↵George Claghorn2018-07-303-7/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | violations on delete
* | | | | | Merge pull request #33468 from bdewater/xplatform-cpu-timeRafael França2018-07-301-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Only use CLOCK_PROCESS_CPUTIME_ID if it's defined
| * | | | | | Only use CLOCK_PROCESS_CPUTIME_ID if it's definedBart de Water2018-07-291-2/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | It's not defined on JRuby and unlike monotonic time, concurrent-ruby doesn't have an cross-platform abstraction for this.
* | | | | | ActiveModel::Naming delegate match? in the same manner as =~ and != (#33466)Bart2018-07-291-1/+17
| | | | | | | | | | | | | | | | | | The purpose of the module seems to quack like a string.
* | | | | | Extract `Relation#bind_attribute` for internal useRyuta Kamizono2018-07-302-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | To make it easier to construct boundable predicate.
* | | | | | Update ActiveStorage::Previewer docsGeorge Claghorn2018-07-291-2/+2
|/ / / / / | | | | | | | | | | | | | | | PDFPreviewer became MuPDFPreviewer in 0b717c2. Previewers are simple enough that we can just provide a single example.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 19:24:14 +0000