aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Decouple the merge/normalization and conditional cache control logicPatrick Toomey2017-08-232-5/+13
| | | | | | | | | | | | | | | | The prior logic was trying to do too many things at once. For all responses, we want to perform two distinct steps: * Merge/normalize the `Cache-Control` values found in HTTP headers and those found in the `@cache_control` hash. * Conditionally set a default `Cache-Control` header value when we have an ETag This change separates these concerns since the merge/normalize step should occur for all responses, but the second should only occur when we have already set an ETag/last modified value. Normally ETag middleware will set a default `Cache-Control`, but only if an existing ETag is not already set. So, in the cases where an ETag is set, we need to set the default `Cache-Control` value ourselves.
* This constant is no longer usedPatrick Toomey2017-08-221-1/+0
|
* Let middleware handle default cache behaviorPatrick Toomey2017-08-221-1/+2
|
* Use equality in place of refute assertions for accuracyPatrick Toomey2017-08-221-4/+2
|
* Normalize/process Cach-Control headers consistentlyPatrick Toomey2017-08-222-3/+24
| | | | | | | | | | In the existing logic, the `Cache-Control` header may or may not get normalized by additional logic depending on whether `response.cache_conrol` has been modified. This leads to inconsistent behavior, since sometimes `Cache-Control` can contain whatever a user sets and sometimes it gets normalized, based on the logic inside of `set_conditional_cache_control!`. It seems like this normalization process should happen regardless to ensure consistent behavior.
* Merge pull request #30363 from ibrahimab/patch-1Ryuta Kamizono2017-08-231-1/+1
|\ | | | | Fixing nginx configuration added missing semicolon [ci skip]
| * Fixing nginx configuration added missing semicolonIbrahim2017-08-221-1/+1
|/
* Merge pull request #30336 from bogdanvlviv/use_version_5_2_for_activestorageRafael França2017-08-222-2/+2
|\ | | | | Use 5.2 version of ActiveRecord::Migration for Active Storage
| * Use 5.2 version of ActiveRecord::Migration for Active Storagebogdanvlviv2017-08-222-2/+2
|/
* Merge pull request #30356 from ↵Kasper Timm Hansen2017-08-222-2/+1
|\ | | | | | | | | bogdanvlviv/remove-frozen_string_literal-from-blob-migration Remove frozen_string_literal comment from activestorage's migration
| * Remove frozen_string_literal comment from activestorage's migrationbogdanvlviv2017-08-222-2/+1
| | | | | | | | | | The activestorage's migration is used as template for apps Related to #30348
* | Merge pull request #23425 from yui-knk/support_sti_automatically_inverseAkira Matsuda2017-08-223-2/+43
|\ \ | | | | | | Automatically guess the inverse associations for STI
| * | Automatically guess the inverse associations for STIyui-knk2017-08-223-2/+43
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord associations automatically guess the inverse associations. But this feature does not work correctly on assoctions for STI. For example, before this commit ``` class Post < ActiveRecord::Base belongs_to :author end class SpecialPost < Post; end class Author < ActiveRecord::Base has_many :posts has_many :special_posts end ``` `author.posts.first.author` works correctly, but `author.special_posts.first.author` does not work correctly.
* | Merge pull request #30357 from ydakuka/missing-backquotesRyuta Kamizono2017-08-223-4/+4
|\ \ | | | | | | missing backquotes [ci skip]
| * | missing backquotes [ci skip]Yauheni Dakuka2017-08-223-4/+4
| | |
* | | Merge pull request #30353 from yhirano55/use_https_instead_of_http_in_actionpackRyuta Kamizono2017-08-229-21/+21
|\ \ \ | | | | | | | | [actionpack] Update links to use https link instead of http [ci skip]
| * | | Update links to use https link instead of http [ci skip]Yoshiyuki Hirano2017-08-229-21/+21
|/ / /
* | | Merge pull request #30354 from ↵Ryuta Kamizono2017-08-2212-13/+13
|\ \ \ | | | | | | | | | | | | | | | | yhirano55/use_https_instead_of_http_in_activerecord [activerecord] Update links to use https instead of http [ci skip]
| * | | Update links to use https instead of http [ci skip]Yoshiyuki Hirano2017-08-2212-13/+13
| | |/ | |/|
* | | Merge pull request #30348 from koic/remove_frozen_string_literal_from_templatesGeorge Claghorn2017-08-2142-85/+0
|\ \ \ | | | | | | | | Remove frozen_string_literal magic comment from templates
| * | | Remove frozen_string_literal magic comment from templatesKoichi ITO2017-08-2242-85/+0
| | | |
* | | | Merge pull request #30355 from ↵Ryuta Kamizono2017-08-225-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yhirano55/use_https_instead_of_http_in_activesupport [activesupport] Update links to use https instead of http [ci skip]
| * | | | Update links to use https instead of http [ci skip]Yoshiyuki Hirano2017-08-225-6/+6
|/ / / /
* | | | Merge pull request #30352 from yhirano55/update_licenses_linkRyuta Kamizono2017-08-2212-15/+14
|\ \ \ \ | | | | | | | | | | Update MIT licenses link [ci skip]
| * | | | Update MIT licenses link [ci skip]Yoshiyuki Hirano2017-08-2212-15/+14
| | |/ / | |/| |
* | | | Add frozen string literal pragmaGeorge Claghorn2017-08-211-0/+2
| | | |
* | | | Encode Content-Disposition filenames according to RFC 2231George Claghorn2017-08-216-4/+74
| |_|/ |/| | | | | | | | Closes #30134.
* | | Merge pull request #30349 from ydakuka/patch-1Ryuta Kamizono2017-08-221-4/+4
|\ \ \ | | | | | | | | Update debugging rails applications guide [ci skip]
| * | | Update debugging_rails_applications [ci skip]Yauheni Dakuka2017-08-211-4/+4
|/ / /
* | | Merge pull request #28912 from kaspth/getting-started-form-withKasper Timm Hansen2017-08-212-67/+100
|\ \ \ | |_|/ |/| | [ci skip] form_with in the getting started guide.
| * | [ci skip] form_with in the getting started guide.Kasper Timm Hansen2017-08-212-67/+100
| | | | | | | | | | | | Add back a bit about a resource oriented style of routing.
* | | Merge pull request #30346 from ↵Ryuta Kamizono2017-08-222-2/+2
|\ \ \ | |_|/ |/| | | | | | | | yhirano55/fix_broken_link_to_mysql_docs_in_database_yml Fix broken link to mysql docs in database.yml [ci skip]
| * | Fix broken link to mysql docs in database.yml [ci skip]Yoshiyuki Hirano2017-08-222-2/+2
|/ /
* | Merge pull request #30345 from yhirano55/fix_link_contributing_guideEileen M. Uchitelle2017-08-211-7/+7
|\ \ | | | | | | Fix link in Contributing Ruby on Rails guide [ci skip]
| * | Fix link Contributing Ruby on Rails [ci skip]Yoshiyuki Hirano2017-08-211-7/+7
|/ / | | | | | | | | | | | | | | | | * Add Contributing to the Rails Code link. * Wiki link for Spanish is redirect. * The base branch of Polish repo is master. And Turkish is, too. * Unified expression `rails-dev-box` * The Clone url is wrong. * The mailing list url is old.
* | Merge pull request #30344 from yhirano55/update_guide_contributing_ruby_on_railsप्रथमेश Sonpatki2017-08-211-1/+1
|\ \ | | | | | | Update Contributing to Ruby on Rails guide [ci skip]
| * | Update Contributing to Ruby on Rails guide [ci skip]Yoshiyuki Hirano2017-08-211-1/+1
|/ /
* | Merge pull request #30343 from yhirano55/update_generator_guideVipul A M2017-08-211-4/+8
|\ \ | | | | | | Update generator guide [ci skip]
| * | Update generator guide [ci skip]Yoshiyuki Hirano2017-08-211-4/+8
| | |
* | | Prevent extra `SET time zone` in `configure_connection` (#28413)Ryuta Kamizono2017-08-212-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | `SET time zone 'value'` is an alias for `SET timezone TO 'value'`. https://www.postgresql.org/docs/current/static/sql-set.html So if `variables["timezone"]` is specified, it is enough to `SET timezone` once.
* | | Merge pull request #30341 from yhirano55/update_rails_on_rack_guideप्रथमेश Sonpatki2017-08-211-1/+1
|\ \ \ | |/ / |/| | Update Rails on Rack guide [ci skip]
| * | Update Rails on Rack guide [ci skip]Yoshiyuki Hirano2017-08-211-1/+1
|/ /
* | Merge pull request #30332 from y-yagi/fix_29306George Claghorn2017-08-207-17/+44
|\ \ | | | | | | Make `restart` and `dev:cache` tasks work when customizing pid file path
| * | Make `restart` and `dev:cache` tasks work when customizing pid file pathyuuji.yaginuma2017-08-217-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, it hard-coded pid file path. It can not be removed when customizing pid file path. But rake task can not get pid file path. Therefore, do not remove file in rake task, makes it possible to judge whether it is restart from the argument of the command and removes the file in server command. Fixes #29306
* | | Merge pull request #30340 from ↵Ryuta Kamizono2017-08-211-1/+10
|\ \ \ | | | | | | | | | | | | | | | | yhirano55/update_autoloading_and_reloading_constants Update Autoloading and Reloading Constants guide [ci skip]
| * | | Update result of autoload_paths in Autoloading and Reloading Constants guide ↵Yoshiyuki Hirano2017-08-211-1/+10
|/ / / | | | | | | | | | [ci skip]
* | | Update regexGeorge Claghorn2017-08-201-1/+1
| | |
* | | Fix testsGeorge Claghorn2017-08-204-4/+4
| | |
* | | Fix syntax errorGeorge Claghorn2017-08-201-1/+1
| | |
* | | DRYGeorge Claghorn2017-08-208-16/+20
| | |