Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port back master changes to 3.4 #1464

Merged
merged 25 commits into from
Apr 29, 2018
Merged

Conversation

gauravtiwari
Copy link
Member

This PR merges compatible commits to 3.4 stable branch

rossta and others added 25 commits April 29, 2018 19:13
* CI against latest supported versions of Ruby
Currently it adds an extra indent level in a new webpacker Rails project's development.rb and production.rb, so the `config` statement doesn't line up with the others.
Currently we can run webpacker in either http or https mode.
But if we run webpacker in http mode but access it through a reverse proxy handling https, then it will break because the reverse proxy will have set HTTP_X_FORWARDED_PROTO to https and webpack-dev-server will try to understand the request as a secured one.

We must override X_FORWARDED_PROTO in the same way as we override the other headers.
@gauravtiwari gauravtiwari merged commit 224fc6f into 3-4-stable Apr 29, 2018
@gauravtiwari gauravtiwari deleted the master-changes-to-3.4 branch April 29, 2018 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.