aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #32121 from benoittgt/move-rails-routes-to-rails-commandRafael França2018-02-275-143/+170
|\ \ \ \
| * | | | Move rake routes task to rails commandBenoit Tigeot2018-02-275-143/+170
* | | | | Merge pull request #32125 from rails/switch-to-not-enforcing-utf8-by-defaultAndrew White2018-02-2714-42/+202
|\ \ \ \ \
| * | | | | Don't enforce UTF-8 by defaultAndrew White2018-02-2714-42/+202
* | | | | | Merge pull request #31966 from kg8m/fix_limited_ids_forRyuta Kamizono2018-02-286-17/+30
|\ \ \ \ \ \
| * | | | | | Fix `#columsn_for_distinct` of MySQL and PostgreSQLkg8m2018-02-276-17/+30
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #28270 from mmangino/dont_ignore_seralization_optionsRyuta Kamizono2018-02-273-1/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix styleMike Mangino2017-03-031-1/+1
| * | | | | Don't accidentally lose includes in serializationMike Mangino2017-03-033-4/+13
* | | | | | Merge pull request #32005 from maschwenk/ar-distinct-order-count-regressionRyuta Kamizono2018-02-273-1/+13
|\ \ \ \ \ \
| * | | | | | Distinct with order #count regressionMax Schwenk2018-02-252-1/+9
* | | | | | | Merge pull request #32126 from marceloperini/marceloperini/add-nodoc-to-Actio...Rafael França2018-02-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | add :nodoc: to ActionView::Helpers::FormBuilder#emitted_hidden_id?Marcelo Perini Veloso2018-02-271-1/+1
* | | | | | | | Merge pull request #31189 from tgxworld/raise_error_when_advisory_lock_is_not...Rafael França2018-02-272-2/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Raise an error if advisory lock in migrator was not released.Guo Xiang Tan2017-11-212-2/+27
* | | | | | | | Merge pull request #32124 from willnet/change-order-files-requiredYuji Yaginuma2018-02-271-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | [ci skip]Change requring order of files in docwillnet2018-02-271-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #26799 from deraru/support-i18n-key-in-submit-tagRafael França2018-02-264-3/+48
|\ \ \ \ \ \ \
| * | | | | | | Change translation key of submit_tag from module_name_class_name to module_na...Rui Onodera2018-02-274-3/+48
* | | | | | | | Merge pull request #32115 from avneetmalhotra/routing_bound_parameters_guide_fixRafael França2018-02-261-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Correct `to` option's value of the route in the Bound Parameters section in r...Avneet Singh Malhotra2018-02-261-1/+1
* | | | | | | | Merge pull request #32122 from bogdanvlviv/remove-extra-changelog-added-by-31944Rafael França2018-02-261-16/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove extra changelog added by #31944bogdanvlviv2018-02-271-16/+0
* | | | | | | | | Clear Blob's type before sending itGeorge Claghorn2018-02-262-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #31944 from equivalent/delegate_privateKasper Timm Hansen2018-02-263-2/+117
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | add private: true option for ActiveSupport delegateTomas Valent2018-02-263-2/+117
|/ / / / / / /
* | | | | | | Update test to reflect direct upload header changesGeorge Claghorn2018-02-261-1/+1
* | | | | | | Partly revert 91b30a001b79096b60d9424a4664a417dce0b767Ryuta Kamizono2018-02-271-1/+7
* | | | | | | Ensure we don't write virtual attributes on update, tooSean Griffin2018-02-263-2/+6
* | | | | | | Never attempt to write virtual attributes to the databaseSean Griffin2018-02-262-1/+22
* | | | | | | Avoid specifying content types for direct uploads to Google Cloud StorageGeorge Claghorn2018-02-262-6/+5
|/ / / / / /
* | / / / / Fix "NameError: uninitialized constant Categorization::Category"yuuji.yaginuma2018-02-261-0/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #32106 from bogdanvlviv/fix-rails-6_0_changelogsRyuta Kamizono2018-02-263-36/+0
|\ \ \ \ \
| * | | | | Remove changelogs for Rails 6.0 since they were backported to `5-2-stable`bogdanvlviv2018-02-263-36/+0
|/ / / / /
* | | | | Active Model: Use private attr_readerRyuta Kamizono2018-02-264-11/+6
* | | | | Merge pull request #31895 from kamipo/do_not_attempt_to_find_inverse_of_polym...Ryuta Kamizono2018-02-267-10/+30
|\ \ \ \ \
| * | | | | Do not attempt to automatically find the inverse of a polymorphic `belongs_to...Ryuta Kamizono2018-02-191-10/+4
| * | | | | Make `reflection.klass` raise if `polymorphic?` not to be misusedRyuta Kamizono2018-02-197-1/+27
* | | | | | Association creation and finding should work consistently (#32048)Ryuta Kamizono2018-02-263-7/+37
* | | | | | Remove native `Array#sum` and `Enumerable#sum` detection (#32102)Ryuta Kamizono2018-02-261-63/+44
* | | | | | Merge pull request #32100 from eugeneius/active_storage_lazy_load_hookGeorge Claghorn2018-02-243-1/+15
|\ \ \ \ \ \
| * | | | | | Use lazy load hook to configure ActiveStorage::BlobEugene Kenny2018-02-253-1/+15
|/ / / / / /
* | | | | | Merge pull request #31720 from grantbdev/update_default_hsts_max_ageGuillermo Iguaran2018-02-242-7/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into update_default_hsts_max_ageGuillermo Iguaran2018-02-24659-6371/+7493
| |\ \ \ \ \ \
| * | | | | | | Update default HSTS max-age value to 1 yearGrant Bourque2018-01-163-7/+11
* | | | | | | | Support for automatic nonce generation was backported to 5.2Guillermo Iguaran2018-02-241-28/+0
| |/ / / / / / |/| | | | | |
* | | | | | | Support varying ICO filesGeorge Claghorn2018-02-244-2/+21
* | | | | | | [ci skip] Spell out the full variable in generated code.Kasper Timm Hansen2018-02-241-1/+1
* | | | | | | Correctly set `content_security_policy_nonce_generator`yuuji.yaginuma2018-02-241-1/+1
* | | | | | | Merge pull request #32093 from jfragoulis/correct-method-documentationYuji Yaginuma2018-02-241-1/+1
|\ \ \ \ \ \ \