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

fix(dav): add string comparison for diff #37626

Merged
merged 1 commit into from
Apr 11, 2023
Merged

Conversation

miaulalala
Copy link
Contributor

Summary

The diffing didn't diff. Now it does.

Before After
image image

Checklist

Signed-off-by: Anna Larch <anna@nextcloud.com>
@miaulalala miaulalala added the 3. to review Waiting for reviews label Apr 6, 2023
@miaulalala miaulalala added this to the Nextcloud 26.0.1 milestone Apr 6, 2023
@miaulalala miaulalala self-assigned this Apr 6, 2023
@miaulalala miaulalala requested review from a team, ArtificialOwl, icewind1991 and blizzz and removed request for a team April 7, 2023 10:34
@blizzz blizzz merged commit 784b2bd into master Apr 11, 2023
@blizzz blizzz deleted the fix/compare-imip-email-values branch April 11, 2023 17:36
@blizzz blizzz modified the milestones: Nextcloud 26.0.1, Nextcloud 27 Apr 11, 2023
@blizzz
Copy link
Member

blizzz commented Apr 11, 2023

master is 27 btw, if backport is needed, please trigger the bot.

@ChristophWurst
Copy link
Member

/backport to stable26

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@miaulalala
Copy link
Contributor Author

/backport to stable26

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Event invitation update email shows everything changed
4 participants