aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #35869 from abhaynikam/35866-add-touch-option-for-has-one-...Ryuta Kamizono2019-04-255-4/+81
|\
| * Adds touch option to has_one associationAbhay Nikam2019-04-255-4/+81
* | Fix markup in CHANGELOGs [ci skip]Ryuta Kamizono2019-04-252-3/+5
* | Merge pull request #36079 from sharang-d/update-changelogGeorge Claghorn2019-04-241-1/+1
|\ \
| * | Update changelog for a bug-fix to read better [ci skip]Sharang Dashputre2019-04-241-1/+1
|/ /
* | Merge pull request #36072 from itsWill/dont_fail_on_unsuported_imagesGeorge Claghorn2019-04-243-4/+24
|\ \
| * | Don't fail ImageAnalyzer on unsupported typesGuilherme Mansur2019-04-243-4/+24
* | | Avoid redundant `attribute_alias?` before `attribute_alias`Ryuta Kamizono2019-04-249-31/+24
* | | Merge pull request #36074 from kamipo/in_clause_lengthRyuta Kamizono2019-04-2410-167/+75
|\ \ \
| * | | Fix sliced IN clauses to be groupedRyuta Kamizono2019-04-2410-167/+75
|/ / /
* | | Re-organize `init_internals`Ryuta Kamizono2019-04-241-5/+4
* | | Simplify restore state conditionRyuta Kamizono2019-04-241-4/+2
* | | Lazy allocate `@_start_transaction_state`Ryuta Kamizono2019-04-242-8/+10
| |/ |/|
* | Merge pull request #36069 from st0012/remove-redundant-test-setupRafael França2019-04-231-21/+1
|\ \
| * | Remove redundant test setups in log_subscriber_testst00122019-04-241-21/+1
* | | Merge pull request #36067 from st0012/update-generator-for-api-appRafael França2019-04-233-0/+11
|\ \ \
| * | | Remove action_controller.perform_caching from api app's configsst00122019-04-243-0/+11
| |/ /
* | | Merge pull request #36070 from imechemi/fix-minor-api-docRyuta Kamizono2019-04-241-1/+1
|\ \ \
| * | | Fix rdoc rendering for push alias symbolTenzin Chemi2019-04-231-1/+1
| | |/ | |/|
* | | Merge pull request #35852 from larouxn/resurrectionRafael França2019-04-232-0/+9
|\ \ \
| * | | Burn unnecessary files 🔥Nicholas La Roux2019-04-053-19/+0
| * | | Style fixesNicholas La Roux2019-04-051-3/+3
| * | | Resurrect generator templatesNicholas La Roux2019-04-052-0/+4
| * | | Resurrect js/js engine options and generatorsNicholas La Roux2019-04-053-0/+24
* | | | Rename local variable `n` to `name`Ryuta Kamizono2019-04-242-3/+3
| |/ / |/| |
* | | Merge pull request #36066 from st0012/update-controller-cache-docRafael França2019-04-231-2/+2
|\ \ \
| * | | Update document about perform_caching's default valuest00122019-04-241-2/+2
| | |/ | |/|
* | | Make association builder methods privateRyuta Kamizono2019-04-247-1/+16
* | | Merge pull request #35928 from flanger001/form-with-does-not-generate-ids-by-...Gannon McGibbon2019-04-231-1/+1
|\ \ \ | |/ / |/| |
| * | Make docs on form_with_generates_ids config option match the valueDavid Shaffer2019-04-231-1/+1
|/ /
* | Merge pull request #36061 from shioyama/update_commentRafael França2019-04-231-2/+3
|\ \
| * | Update comment in attribute_method_matchers_matchingChris Salzberg2019-04-231-2/+3
* | | Merge pull request #36063 from albertoalmagro/finish-documentation-for-after-...Rafael França2019-04-231-8/+0
|\ \ \
| * | | Remove reminiscences from previous documentation [ci skip]Alberto Almagro2019-04-231-8/+0
* | | | Merge pull request #36059 from composerinteralia/model-attribute-namesRafael França2019-04-232-0/+58
|\ \ \ \
| * | | | Add attribute_names to ActiveModel::AttributesDaniel Colson2019-04-222-0/+58
* | | | | Merge pull request #36060 from st0012/fix-35602-docRafael França2019-04-231-0/+9
|\ \ \ \ \
| * | | | | Add ActionController::Caching into api app's documentst00122019-04-231-0/+9
* | | | | | Merge pull request #36057 from jhawthorn/activejob_retry_logicEileen M. Uchitelle2019-04-232-5/+37
|\ \ \ \ \ \
| * | | | | | Use ActiveJob 5.2 retry logic for old jobsJohn Hawthorn2019-04-222-5/+37
* | | | | | | Add PR link for Active Storage updating release note entry [ci skip]Abhay Nikam2019-04-231-0/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #36029 from kamipo/deprecate_where_notRyuta Kamizono2019-04-235-15/+118
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Deprecate `where.not` working as NOR and will be changed to NAND in Rails 6.1Ryuta Kamizono2019-04-195-15/+118
| | |/ / / | |/| | |
* | | | | Implements the task zeitwerk:checkXavier Noria2019-04-233-0/+90
| |_|/ / |/| | |
* | | | upgrades Zeitwerk to 2.1.4Xavier Noria2019-04-235-65/+33
| |/ / |/| |
* | | Merge pull request #36058 from rails/revert-36038-fix-35602Rafael França2019-04-222-14/+0
|\ \ \
| * | | Revert "Include Caching module for ActionController::API"Rafael França2019-04-222-14/+0
|/ / /
* | | Merge pull request #36038 from st0012/fix-35602Guillermo Iguaran2019-04-222-0/+14
|\ \ \
| * | | Make sure api controllers can perform caching as wellst00122019-04-192-0/+14
| |/ /
* | | [ci skip] Active Storage: updating associations replacesKasper Timm Hansen2019-04-221-0/+2