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

Git integration #1954

Merged
merged 81 commits into from
Jul 6, 2020
Merged

Git integration #1954

merged 81 commits into from
Jul 6, 2020

Conversation

jesseleite
Copy link
Member

@jesseleite jesseleite commented Jun 18, 2020

Moving Spock functionality into v3 (will be a 'Pro' feature).

Closes statamic/ideas#199.

@jesseleite
Copy link
Member Author

Oh @jackmcdade, just a reminder this guy needs a proper utility icon whenever you have time...
image

- Save method always dispatches event
- Moving an asset will just save itself instead of using a dedicated event.
- Remove Asset::replace(), it's never used.
- Keep AssetUploaded event, but don't use it for Git.
- Asset doesn't need a file uploaded in the Git tests. Explicitly test the upload case.
- Adjust asset tests to handle save being called. (Check event is dispatched, fake the dimension cache disk, and use image method so an actual image is faked.)
# Conflicts:
#	resources/lang/fr.json
#	resources/lang/fr/messages.php
@jasonvarga jasonvarga merged commit 0902b78 into master Jul 6, 2020
@jesseleite jesseleite deleted the feature/git-integration branch July 6, 2020 21:09
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.

Git integration (formerly Spock)
2 participants