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

Updating twig call to utilise asset(), to match README.md (closes #830) #836

Merged
merged 1 commit into from
Dec 11, 2016

Conversation

alexwilson
Copy link
Collaborator

See #834, only on my fork and with without me breaking the test suite.

@lsmith77 lsmith77 added the State: Reviewing This item is being reviewed to determine if it should be accepted. label Dec 11, 2016
@robfrawley
Copy link
Collaborator

Hmm... why is Travis trying to clone branch feature/use-asset-for-twig?

Copy link
Collaborator

@robfrawley robfrawley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@alexwilson
Copy link
Collaborator Author

Not sure, I reckon it's cached a copy of the repo with my initial incorrect branch and it's trying to somehow resolve that commit to that branch - All the more reason to avoid pushing to branches on here!

@alexwilson alexwilson merged commit 1eac259 into liip:1.0 Dec 11, 2016
@alexwilson alexwilson deleted the update-basic-usage-assetic branch December 11, 2016 19:45
@lsmith77 lsmith77 removed the State: Reviewing This item is being reviewed to determine if it should be accepted. label Dec 11, 2016
@robfrawley
Copy link
Collaborator

@antoligy Cherry picked your commit for 2.x branch: https://github.com/liip/LiipImagineBundle/commits/2.0

@alexwilson
Copy link
Collaborator Author

Sounds good- Is it worth establishing a standard for how we push 1.0 changes to 2.0? I am happy to cherry pick but obviously this becomes more of a problem with more commits.

@robfrawley
Copy link
Collaborator

I know... and I agree. Suggestions for a standard?

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.

3 participants