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

Restore manifest/env asset lookup order and make it configurable #278

Merged
merged 1 commit into from
Sep 29, 2015

Conversation

jeremy
Copy link
Member

@jeremy jeremy commented Sep 29, 2015

  • Revert env-first lookup order from Fix stuck assets in dev due to a stale precompiled manifest #276 to support using both manifest and a live environment in production.
  • Default to manifest first, env second. Skip manifest if debug enabled or digests disabled. Skip env if it's unavailable.
  • Override with config.assets.resolve_with = %i[ manifest environment ]

@rafaelfranca
Copy link
Member

👏

The test failure is weird though

@jeremy jeremy force-pushed the explicit-asset-lookup-locations branch 2 times, most recently from a423b84 to 9ada640 Compare September 29, 2015 18:34
@jeremy
Copy link
Member Author

jeremy commented Sep 29, 2015

Fix test fail on 1.9 due to using %i[ … ]

* Revert env-first lookup order from rails#276 to support using both manifest
  and a live environment in production.
* Default to manifest first, env second. Skip manifest if debug enabled
  or digests disabled. Skip env if it's unavailable.
* Override with `config.assets.resolve_with = %i[ manifest environment ]`
@jeremy jeremy force-pushed the explicit-asset-lookup-locations branch from 9ada640 to a955c16 Compare September 29, 2015 18:36
@rafaelfranca
Copy link
Member

Now **options

@jeremy
Copy link
Member Author

jeremy commented Sep 29, 2015

Got it

jeremy added a commit that referenced this pull request Sep 29, 2015
Restore manifest/env asset lookup order and make it configurable
@jeremy jeremy merged commit e003cfd into rails:master Sep 29, 2015
@jeremy jeremy deleted the explicit-asset-lookup-locations branch September 29, 2015 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.

2 participants