aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Correct ActiveSupport::Deprecation::Behavior#behavior= documentationJohn Fragoulis2018-02-231-1/+1
* | | | Merge pull request #32095 from bogdanvlviv/require_rails-ujs-in-generated-engineRafael França2018-02-232-1/+6
|\ \ \ \
| * | | | Improve generated file `app/assets/javascripts/application.js` of pluginbogdanvlviv2018-02-232-1/+6
| |/ / /
* / / / Caching: MemCache and Redis stores use local cache for multi-readsGabriel Sobrinho2018-02-233-0/+32
|/ / /
* | | More exercise range predicate builderRyuta Kamizono2018-02-231-0/+9
* | | PostgreSQL: Allow BC dates like datetime consistentlyRyuta Kamizono2018-02-233-1/+22
* | | PostgreSQL: Treat infinite values in date like datetime consistentlyRyuta Kamizono2018-02-237-4/+107
* | | Use private attr_readerRyuta Kamizono2018-02-2312-26/+13
* | | Merge pull request #32092 from yahonda/use_rubocop_0_52_at_codeclimateRafael França2018-02-221-1/+1
|\ \ \
| * | | Use `rubocop-0-52` channelYasuo Honda2018-02-231-1/+1
|/ / /
* | | Merge pull request #32091 from utilum/update_rubocopRafael França2018-02-221-10/+9
|\ \ \
| * | | Update rubocop to the latest versionutilum2018-02-231-10/+9
* | | | Merge pull request #32089 from bogdanvlviv/fix-plugin-generated-filesRafael França2018-02-223-3/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Improve generated file `app/views/application.html.erb` of pluginbogdanvlviv2018-02-232-1/+14
| * | | Comment `require "active_storage/engine"` in `bin/rails` of plugin if `--skip...bogdanvlviv2018-02-232-2/+3
* | | | Merge pull request #32090 from bogdanvlviv/remove-passing-extra-arguments-to-...Rafael França2018-02-223-4/+4
|\ \ \ \
| * | | | Remove passing extra arguments to ActiveJob Callbacksbogdanvlviv2018-02-233-4/+4
| |/ / /