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

Bugfix/slow sync with tray open #6691

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Conversation

allexzander
Copy link
Contributor

No description provided.

@allexzander
Copy link
Contributor Author

/backport to stable-3.13

@allexzander
Copy link
Contributor Author

/backport to stable-3.12

@allexzander allexzander force-pushed the bugfix/slow-sync-with-tray-open branch from 5ea5a27 to 9fac497 Compare April 24, 2024 18:28
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6691-9fac497e6e7ba7f1f429f109212240eb65d1cf14-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@allexzander allexzander merged commit 7e801d6 into master Apr 25, 2024
11 of 13 checks passed
@allexzander allexzander deleted the bugfix/slow-sync-with-tray-open branch April 25, 2024 08:18
Copy link

backportbot bot commented Apr 25, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12

# Create the new backport branch
git checkout -b backport/6691/stable-3.12

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick fc31ac4a 9fac497e

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6691/stable-3.12

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
src/gui/macOS/ClientCommunicationProtocol.h
Please commit your changes or stash them before you switch branches.
Aborting


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

allexzander added a commit that referenced this pull request Apr 25, 2024
mgallien pushed a commit that referenced this pull request Apr 25, 2024
memurats pushed a commit to nextmcloud/desktop that referenced this pull request Jun 20, 2024
…h-tray-open

Bugfix/slow sync with tray open
memurats pushed a commit to nextmcloud/desktop that referenced this pull request Jun 20, 2024
…h-tray-open

Bugfix/slow sync with tray open
memurats pushed a commit to nextmcloud/desktop that referenced this pull request Jun 21, 2024
…h-tray-open

Bugfix/slow sync with tray open
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.

3 participants