aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #33524 from spikeheap/masterPrem Sichanugrist2018-08-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Update adding member routes guide to fix inconsistency with the imp...Ryan Brooks2018-08-031-1/+1
|/ / / / / / / / /
* | | | | | | | | `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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | don't establish connection test_database since it gets established in load_sc...Britni Alexander2018-08-011-1/+0
|/ / / / / / /
* | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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 "Merge pull request #24131 from brchristian/limit_and_primary_key"Ryuta Kamizono2018-08-013-22/+1
| * | | | | | | 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`Jon Moss2017-04-302-1/+15
* | | | | | | | Merge pull request #33490 from rails/revert-31883-remove-label-in-porgress-fo...Xavier Noria2018-07-311-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Remove label 'work in progress' for AM and AV guides"Xavier Noria2018-07-311-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #31883 from bogdanvlviv/remove-label-in-porgress-for-M-V-g...Richard Schneeman2018-07-311-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove label 'work in progress' for AM and AV guidesbogdanvlviv2018-02-041-2/+0
* | | | | | | | | Merge pull request #33488 from znz/avoid-to-post-twiceRafael França2018-07-311-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Throw if ujs loaded twiceKazuhiro NISHIYAMA2018-07-311-1/+2
* | | | | | | | | | Merge pull request #33489 from Atul9/remote-ipGeorge Claghorn2018-07-312-1/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Log the remote IP addr of clients behind a proxyAtul Bhosale2018-07-312-1/+7
|/ / / / / / / / /
* | | | | | | | | :scissors: .Ryuta Kamizono2018-07-311-1/+1
* | | | | | | | | Merge pull request #33446 from ptoomey3/nested-respond-toRichard Schneeman2018-07-314-0/+70
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Raises exception when respond_to called multiple times in incompatible wayPatrick Toomey2018-07-304-0/+70
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #33486 from f-mer/patch-1Ryuta Kamizono2018-07-311-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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`.Aditya Kapoor2018-07-311-1/+1
* | | | | | | | | | Merge pull request #33481 from da-edra/readme-over-httpsKasper Timm Hansen2018-07-311-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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
* | | | | | | | | Avoid extra scoping when using `Relation#update`Ryuta Kamizono2018-07-313-3/+9
* | | | | | | | | 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:Edouard CHIN2018-07-302-14/+52
* | | | | | | | | | Merge pull request #33467 from bdewater/chomp-unconditionallyKasper Timm Hansen2018-07-301-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 usedYasuo Honda2018-07-301-2/+7
* | | | | | | | | | | MySQL: Raise ActiveRecord::InvalidForeignKey for foreign-key constraint viola...George Claghorn2018-07-303-7/+20
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #33468 from bdewater/xplatform-cpu-timeRafael França2018-07-301-2/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Only use CLOCK_PROCESS_CPUTIME_ID if it's definedBart de Water2018-07-291-2/+8
| |/ / / / / / / / /
* | | | | | | | | | ActiveModel::Naming delegate match? in the same manner as =~ and != (#33466)Bart2018-07-291-1/+17
* | | | | | | | | | Extract `Relation#bind_attribute` for internal useRyuta Kamizono2018-07-302-8/+11
* | | | | | | | | | Update ActiveStorage::Previewer docsGeorge Claghorn2018-07-291-2/+2
|/ / / / / / / / /
* | | | | | | | | Extract `Relation#update_counters` for internal useRyuta Kamizono2018-07-304-34/+27
* | | | | | | | | Remove unused `require "active_support/core_ext/regexp"`Ryuta Kamizono2018-07-2912-13/+0