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

Update Tachyon to 2.3.2 #189

Merged
merged 1 commit into from
Jul 27, 2020
Merged

Update Tachyon to 2.3.2 #189

merged 1 commit into from
Jul 27, 2020

Conversation

roborourke
Copy link
Contributor

Fixes fallback to origin for gifs. Also adds webp detection support by checking accept header which makes media on local much much faster.

@roborourke roborourke requested a review from joehoyle July 17, 2020 16:14
@roborourke
Copy link
Contributor Author

Here's a gif to test with

unnamed

@roborourke roborourke added backport v3-branch bug Existing functionality isn't behaving as expected labels Jul 17, 2020
@roborourke roborourke requested a review from rmccue July 21, 2020 13:40
@roborourke roborourke merged commit 960ee23 into master Jul 27, 2020
@roborourke roborourke deleted the update-tachyon-2-3-2 branch July 27, 2020 16:12
@hm-backport
Copy link

hm-backport bot commented Jul 27, 2020

The backport to v3-branch failed:

Commits ["bf5b8577a93e2f6e18b6beb298cc66afa8ee0652"] could not be cherry-picked on top of v3-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v3-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick bf5b8577a93e2f6e18b6beb298cc66afa8ee0652
# Create a new branch with these backported commits.
git checkout -b backport-189-to-v3-branch
# Push it to GitHub.
git push --set-upstream origin backport-189-to-v3-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v3-branch and the compare/head branch is backport-189-to-v3-branch.

@hm-backport
Copy link

hm-backport bot commented Jul 27, 2020

The backport to v3-branch failed:

Commits ["bf5b8577a93e2f6e18b6beb298cc66afa8ee0652"] could not be cherry-picked on top of v3-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v3-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick bf5b8577a93e2f6e18b6beb298cc66afa8ee0652
# Create a new branch with these backported commits.
git checkout -b backport-189-to-v3-branch
# Push it to GitHub.
git push --set-upstream origin backport-189-to-v3-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v3-branch and the compare/head branch is backport-189-to-v3-branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Existing functionality isn't behaving as expected
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants