Skip to content

Rebuild assets and return back styles #982

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

Merged
merged 1 commit into from
Jun 3, 2019

Conversation

bocharsky-bw
Copy link
Contributor

Fix #980

Looks like assets were not rebuilt/committed on a PR that was merged to master that's why we lost all styles after installing Demo from scratch following the README

I just rebuilt the assets and committed changes here.

@javiereguiluz
Copy link
Member

I don't understand this PR:

  1. If I try to merge it, the tool we use says: "Unable to merge branch pull/982. Resolve the conflict by hand and start the command again" But there's no conflict.
  2. If I try to recreate this PR myself, I can't. I rebuild assets ... but end with the same result as in the existing master branch of the repo.

So, I can't merge this ... and I can't reproduce this 🤔 Could you please double check what's going on here? Thanks.

javiereguiluz added a commit that referenced this pull request Jun 3, 2019
…ssets (bocharsky-bw)

This PR was merged into the master branch.

Discussion
----------

Fail CI if the repo is in a dirty state after building assets

In order to prevent things fixed in #982 I think we can check for missing assets on TravisCI

Tests should pass after merging #982

Commits
-------

1ae5bb1 Fail CI if the repo is in a dirty state after building assets
@javiereguiluz javiereguiluz merged commit 0c895f4 into symfony:master Jun 3, 2019
@javiereguiluz
Copy link
Member

I've merged this using GitHub's button instead of Symfony's merging tool. It worked!

@bocharsky-bw
Copy link
Contributor Author

Ah, you were faster than me :)

P.S. Not sure what was the problem though, glad you were able to merge it this way

@bocharsky-bw bocharsky-bw deleted the fix-assets branch June 3, 2019 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No assets are built on installation and there are no instructions for this
2 participants